svn commit: r982935 - in /subversion/trunk/subversion/tests/cmdline: svntest/actions.py switch_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Fri Aug  6 12:16:41 2010
New Revision: 982935

URL: http://svn.apache.org/viewvc?rev=982935&view=rev
Log:
Generate the sandbox a bit earlier in two testcases to allow detecting
if we are in single-db mode. This should fix switch tests 31 and 32 for
multi-db mode.

* subversion/tests/cmdline/svntest/actions.py
  (deep_trees_run_tests_scheme_for_switch): Only build sbox if it was not
     built before.

* subversion/tests/cmdline/switch_tests.py
  (tree_conflicts_on_switch_1_1,
   tree_conflicts_on_switch_1_2): Directly built sbox to allow single-db
     detection

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/actions.py
    subversion/trunk/subversion/tests/cmdline/switch_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=982935&r1=982934&r2=982935&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Fri Aug  6 12:16:41 2010
@@ -2547,7 +2547,8 @@ def deep_trees_run_tests_scheme_for_swit
 
   j = os.path.join
 
-  sbox.build()
+  if not sbox.is_built():
+    sbox.build()
   wc_dir = sbox.wc_dir
 
 

Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=982935&r1=982934&r2=982935&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Aug  6 12:16:41 2010
@@ -2476,6 +2476,8 @@ j = os.path.join
 def tree_conflicts_on_switch_1_1(sbox):
   "tree conflicts 1.1: tree del, leaf edit on switch"
 
+  sbox.build()
+
   # use case 1, as in notes/tree-conflicts/use-cases.txt
   # 1.1) local tree delete, incoming leaf edit
 
@@ -2564,6 +2566,8 @@ def tree_conflicts_on_switch_1_1(sbox):
 def tree_conflicts_on_switch_1_2(sbox):
   "tree conflicts 1.2: tree del, leaf del on switch"
 
+  sbox.build()
+
   # 1.2) local tree delete, incoming leaf delete
 
   expected_output = deep_trees_conflict_output.copy()