subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From v...@apache.org
Subject svn commit: r1343447 [21/27] - in /subversion/branches/javahl-ra: ./ build/ build/ac-macros/ build/generator/ build/generator/templates/ build/win32/ contrib/client-side/emacs/ contrib/server-side/ notes/ notes/api-errata/1.8/ notes/merge-tracking/ sub...
Date Tue, 29 May 2012 01:39:49 GMT
Modified: subversion/branches/javahl-ra/subversion/tests/cmdline/changelist_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/changelist_tests.py?rev=1343447&r1=1343446&r2=1343447&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/branches/javahl-ra/subversion/tests/cmdline/changelist_tests.py Tue May 29 01:39:41 2012
@@ -129,9 +129,6 @@ def verify_changelist_output(output, exp
   if not expected_skips:
     output = [line for line in output if (not _re_cl_skip.match(line))]
 
-  if len(output) != num_expected:
-    raise svntest.Failure("Unexpected number of 'svn changelist' output lines")
-
   for line in output:
     line = line.rstrip()
     match = _re_cl_rem.match(line)
@@ -157,6 +154,10 @@ def verify_changelist_output(output, exp
       raise svntest.Failure("Unexpected changelist skip line: " + line)
     raise svntest.Failure("Unexpected line: " + line)
 
+  if len(output) != num_expected:
+    raise svntest.Failure("Unexpected number of 'svn changelist' output " +
+                          "lines (%d vs %d)" % (len(output), num_expected))
+
 def verify_pget_output(output, expected_props):
   """Compare lines of OUTPUT from 'svn propget' against EXPECTED_PROPS
   (a dictionary mapping paths to property values)."""
@@ -220,15 +221,15 @@ def add_remove_changelists(sbox):
 
   # all dirs in the Greek tree
   expected_skips_all = dict([(x, None) for x in [
-        os.path.join(wc_dir),
-    os.path.join(wc_dir, 'A'),
-    os.path.join(wc_dir, 'A', 'B'),
-    os.path.join(wc_dir, 'A', 'B', 'E'),
-    os.path.join(wc_dir, 'A', 'B', 'F'),
-    os.path.join(wc_dir, 'A', 'C'),
-    os.path.join(wc_dir, 'A', 'D'),
-    os.path.join(wc_dir, 'A', 'D', 'G'),
-    os.path.join(wc_dir, 'A', 'D', 'H'),
+    sbox.ospath(''),
+    sbox.ospath('A'),
+    sbox.ospath('A/B'),
+    sbox.ospath('A/B/E'),
+    sbox.ospath('A/B/F'),
+    sbox.ospath('A/C'),
+    sbox.ospath('A/D'),
+    sbox.ospath('A/D/G'),
+    sbox.ospath('A/D/H'),
     ]])
 
   expected_skips_wc_dir = { wc_dir : None }
@@ -254,17 +255,17 @@ def add_remove_changelists(sbox):
                                                    "--depth", "infinity",
                                                    wc_dir)
   expected_adds = {
-    os.path.join(wc_dir, 'A', 'B', 'E', 'alpha') : 'foo',
-    os.path.join(wc_dir, 'A', 'B', 'E', 'beta') : 'foo',
-    os.path.join(wc_dir, 'A', 'B', 'lambda') : 'foo',
-    os.path.join(wc_dir, 'A', 'D', 'G', 'pi') : 'foo',
-    os.path.join(wc_dir, 'A', 'D', 'G', 'rho') : 'foo',
-    os.path.join(wc_dir, 'A', 'D', 'G', 'tau') : 'foo',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'chi') : 'foo',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'omega') : 'foo',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'psi') : 'foo',
-    os.path.join(wc_dir, 'A', 'D', 'gamma') : 'foo',
-    os.path.join(wc_dir, 'A', 'mu') : 'foo',
+      sbox.ospath('A/B/E/alpha') : 'foo',
+      sbox.ospath('A/B/E/beta') : 'foo',
+      sbox.ospath('A/B/lambda') : 'foo',
+      sbox.ospath('A/D/G/pi') : 'foo',
+      sbox.ospath('A/D/G/rho') : 'foo',
+      sbox.ospath('A/D/G/tau') : 'foo',
+      sbox.ospath('A/D/H/chi') : 'foo',
+      sbox.ospath('A/D/H/omega') : 'foo',
+      sbox.ospath('A/D/H/psi') : 'foo',
+      sbox.ospath('A/D/gamma') : 'foo',
+      sbox.ospath('A/mu') : 'foo',
     }
   verify_changelist_output(output, expected_adds)
 
@@ -273,16 +274,15 @@ def add_remove_changelists(sbox):
   # svn changelist bar WC_DIR/A/D --depth infinity
   exit_code, output, errput = svntest.main.run_svn(".*", "changelist", "bar",
                                                    "--depth", "infinity",
-                                                   os.path.join(wc_dir,
-                                                                'A', 'D'))
+                                                   sbox.ospath('A/D'))
   expected_adds = {
-    os.path.join(wc_dir, 'A', 'D', 'G', 'pi') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'G', 'rho') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'G', 'tau') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'chi') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'omega') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'psi') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'gamma') : 'bar',
+      sbox.ospath('A/D/G/pi') : 'bar',
+      sbox.ospath('A/D/G/rho') : 'bar',
+      sbox.ospath('A/D/G/tau') : 'bar',
+      sbox.ospath('A/D/H/chi') : 'bar',
+      sbox.ospath('A/D/H/omega') : 'bar',
+      sbox.ospath('A/D/H/psi') : 'bar',
+      sbox.ospath('A/D/gamma') : 'bar',
     }
   expected_removals = expected_adds
   verify_changelist_output(output, expected_adds, expected_removals)
@@ -290,12 +290,11 @@ def add_remove_changelists(sbox):
   # svn changelist baz WC_DIR/A/D/H --depth infinity
   exit_code, output, errput = svntest.main.run_svn(".*", "changelist", "baz",
                                                    "--depth", "infinity",
-                                                   os.path.join(wc_dir, 'A',
-                                                                'D', 'H'))
+                                                   sbox.ospath('A/D/H'))
   expected_adds = {
-    os.path.join(wc_dir, 'A', 'D', 'H', 'chi') : 'baz',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'omega') : 'baz',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'psi') : 'baz',
+      sbox.ospath('A/D/H/chi') : 'baz',
+      sbox.ospath('A/D/H/omega') : 'baz',
+      sbox.ospath('A/D/H/psi') : 'baz',
     }
   expected_removals = expected_adds
   verify_changelist_output(output, expected_adds, expected_removals)
@@ -309,11 +308,11 @@ def add_remove_changelists(sbox):
                                                    "--changelist", "foo",
                                                    wc_dir)
   expected_adds = {
-    os.path.join(wc_dir, 'A', 'B', 'E', 'alpha') : 'foo-rename',
-    os.path.join(wc_dir, 'A', 'B', 'E', 'beta') : 'foo-rename',
-    os.path.join(wc_dir, 'A', 'B', 'lambda') : 'foo-rename',
-    os.path.join(wc_dir, 'A', 'mu') : 'foo-rename',
-    os.path.join(wc_dir, 'iota') : 'foo-rename',
+      sbox.ospath('A/B/E/alpha') : 'foo-rename',
+      sbox.ospath('A/B/E/beta') : 'foo-rename',
+      sbox.ospath('A/B/lambda') : 'foo-rename',
+      sbox.ospath('A/mu') : 'foo-rename',
+      sbox.ospath('iota') : 'foo-rename',
     }
   expected_removals = expected_adds
   verify_changelist_output(output, expected_adds, expected_removals)
@@ -325,14 +324,14 @@ def add_remove_changelists(sbox):
     "--changelist", "foo-rename", "--changelist", "baz", wc_dir)
 
   expected_adds = {
-    os.path.join(wc_dir, 'A', 'B', 'E', 'alpha') : 'bar',
-    os.path.join(wc_dir, 'A', 'B', 'E', 'beta') : 'bar',
-    os.path.join(wc_dir, 'A', 'B', 'lambda') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'chi') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'omega') : 'bar',
-    os.path.join(wc_dir, 'A', 'D', 'H', 'psi') : 'bar',
-    os.path.join(wc_dir, 'A', 'mu') : 'bar',
-    os.path.join(wc_dir, 'iota') : 'bar',
+      sbox.ospath('A/B/E/alpha') : 'bar',
+      sbox.ospath('A/B/E/beta') : 'bar',
+      sbox.ospath('A/B/lambda') : 'bar',
+      sbox.ospath('A/D/H/chi') : 'bar',
+      sbox.ospath('A/D/H/omega') : 'bar',
+      sbox.ospath('A/D/H/psi') : 'bar',
+      sbox.ospath('A/mu') : 'bar',
+      sbox.ospath('iota') : 'bar',
     }
   expected_removals = expected_adds
   verify_changelist_output(output, expected_adds, expected_removals)
@@ -360,17 +359,17 @@ def add_remove_changelists(sbox):
                                                    "--depth", "infinity",
                                                    wc_dir)
   expected_removals = {
-    os.path.join(wc_dir, 'A', 'B', 'E', 'alpha') : None,
-    os.path.join(wc_dir, 'A', 'B', 'E', 'beta') : None,
-    os.path.join(wc_dir, 'A', 'B', 'lambda') : None,
-    os.path.join(wc_dir, 'A', 'D', 'G', 'pi') : None,
-    os.path.join(wc_dir, 'A', 'D', 'G', 'rho') : None,
-    os.path.join(wc_dir, 'A', 'D', 'G', 'tau') : None,
-    os.path.join(wc_dir, 'A', 'D', 'H', 'chi') : None,
-    os.path.join(wc_dir, 'A', 'D', 'H', 'omega') : None,
-    os.path.join(wc_dir, 'A', 'D', 'H', 'psi') : None,
-    os.path.join(wc_dir, 'A', 'D', 'gamma') : None,
-    os.path.join(wc_dir, 'A', 'mu') : None,
+      sbox.ospath('A/B/E/alpha') : None,
+      sbox.ospath('A/B/E/beta') : None,
+      sbox.ospath('A/B/lambda') : None,
+      sbox.ospath('A/D/G/pi') : None,
+      sbox.ospath('A/D/G/rho') : None,
+      sbox.ospath('A/D/G/tau') : None,
+      sbox.ospath('A/D/H/chi') : None,
+      sbox.ospath('A/D/H/omega') : None,
+      sbox.ospath('A/D/H/psi') : None,
+      sbox.ospath('A/D/gamma') : None,
+      sbox.ospath('A/mu') : None,
     }
   verify_changelist_output(output, None, expected_removals)
 
@@ -387,12 +386,12 @@ def add_remove_changelists(sbox):
                                                    "--changelist", "a",
                                                    wc_dir)
   expected_removals = {
-    os.path.join(wc_dir, 'A', 'B', 'E', 'alpha') : None,
-    os.path.join(wc_dir, 'A', 'B', 'E', 'beta') : None,
-    os.path.join(wc_dir, 'A', 'B', 'lambda') : None,
-    os.path.join(wc_dir, 'A', 'D', 'H', 'omega') : None,
-    os.path.join(wc_dir, 'A', 'D', 'gamma') : None,
-    os.path.join(wc_dir, 'iota') : None,
+      sbox.ospath('A/B/E/alpha') : None,
+      sbox.ospath('A/B/E/beta') : None,
+      sbox.ospath('A/B/lambda') : None,
+      sbox.ospath('A/D/H/omega') : None,
+      sbox.ospath('A/D/gamma') : None,
+      sbox.ospath('iota') : None,
     }
   verify_changelist_output(output, None, expected_removals)
 
@@ -405,10 +404,10 @@ def add_remove_changelists(sbox):
                                                    "--changelist", "o",
                                                    wc_dir)
   expected_removals = {
-    os.path.join(wc_dir, 'A', 'D', 'G', 'pi') : None,
-    os.path.join(wc_dir, 'A', 'D', 'G', 'rho') : None,
-    os.path.join(wc_dir, 'A', 'D', 'H', 'chi') : None,
-    os.path.join(wc_dir, 'A', 'D', 'H', 'psi') : None,
+      sbox.ospath('A/D/G/pi') : None,
+      sbox.ospath('A/D/G/rho') : None,
+      sbox.ospath('A/D/H/chi') : None,
+      sbox.ospath('A/D/H/psi') : None,
     }
   verify_changelist_output(output, None, expected_removals)
 

Modified: subversion/branches/javahl-ra/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/commit_tests.py?rev=1343447&r1=1343446&r2=1343447&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/branches/javahl-ra/subversion/tests/cmdline/commit_tests.py Tue May 29 01:39:41 2012
@@ -160,7 +160,7 @@ def commit_one_file(sbox):
 
   expected_status = make_standard_slew_of_changes(wc_dir)
 
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
+  omega_path = sbox.ospath('A/D/H/omega')
 
   # Create expected state.
   expected_output = svntest.wc.State(wc_dir, {
@@ -186,7 +186,7 @@ def commit_one_new_file(sbox):
 
   expected_status = make_standard_slew_of_changes(wc_dir)
 
-  gloo_path = os.path.join(wc_dir, 'A', 'D', 'H', 'gloo')
+  gloo_path = sbox.ospath('A/D/H/gloo')
 
   # Create expected state.
   expected_output = svntest.wc.State(wc_dir, {
@@ -212,7 +212,7 @@ def commit_one_new_binary_file(sbox):
 
   expected_status = make_standard_slew_of_changes(wc_dir)
 
-  gloo_path = os.path.join(wc_dir, 'A', 'D', 'H', 'gloo')
+  gloo_path = sbox.ospath('A/D/H/gloo')
   svntest.main.run_svn(None, 'propset', 'svn:mime-type',
                        'application/octet-stream', gloo_path)
 
@@ -241,12 +241,12 @@ def commit_multiple_targets(sbox):
   # This test will commit three targets:  psi, B, and pi.  In that order.
 
   # Make local mods to many files.
-  AB_path = os.path.join(wc_dir, 'A', 'B')
-  lambda_path = os.path.join(wc_dir, 'A', 'B', 'lambda')
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
-  psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
+  AB_path = sbox.ospath('A/B')
+  lambda_path = sbox.ospath('A/B/lambda')
+  rho_path = sbox.ospath('A/D/G/rho')
+  pi_path = sbox.ospath('A/D/G/pi')
+  omega_path = sbox.ospath('A/D/H/omega')
+  psi_path = sbox.ospath('A/D/H/psi')
   svntest.main.file_append(lambda_path, 'new appended text for lambda')
   svntest.main.file_append(rho_path, 'new appended text for rho')
   svntest.main.file_append(pi_path, 'new appended text for pi')
@@ -255,7 +255,7 @@ def commit_multiple_targets(sbox):
 
   # Just for kicks, add a property to A/D/G as well.  We'll make sure
   # that it *doesn't* get committed.
-  ADG_path = os.path.join(wc_dir, 'A', 'D', 'G')
+  ADG_path = sbox.ospath('A/D/G')
   svntest.main.run_svn(None, 'propset', 'foo', 'bar', ADG_path)
 
   # Create expected output tree for 'svn ci'.  We should see changes
@@ -295,12 +295,12 @@ def commit_multiple_targets_2(sbox):
   # This test will commit four targets:  psi, B, omega and pi.  In that order.
 
   # Make local mods to many files.
-  AB_path = os.path.join(wc_dir, 'A', 'B')
-  lambda_path = os.path.join(wc_dir, 'A', 'B', 'lambda')
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
-  psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
+  AB_path = sbox.ospath('A/B')
+  lambda_path = sbox.ospath('A/B/lambda')
+  rho_path = sbox.ospath('A/D/G/rho')
+  pi_path = sbox.ospath('A/D/G/pi')
+  omega_path = sbox.ospath('A/D/H/omega')
+  psi_path = sbox.ospath('A/D/H/psi')
   svntest.main.file_append(lambda_path, 'new appended text for lambda')
   svntest.main.file_append(rho_path, 'new appended text for rho')
   svntest.main.file_append(pi_path, 'new appended text for pi')
@@ -309,7 +309,7 @@ def commit_multiple_targets_2(sbox):
 
   # Just for kicks, add a property to A/D/G as well.  We'll make sure
   # that it *doesn't* get committed.
-  ADG_path = os.path.join(wc_dir, 'A', 'D', 'G')
+  ADG_path = sbox.ospath('A/D/G')
   svntest.main.run_svn(None, 'propset', 'foo', 'bar', ADG_path)
 
   # Created expected output tree for 'svn ci'.  We should see changes
@@ -350,7 +350,7 @@ def commit_inclusive_dir(sbox):
 
   expected_status = make_standard_slew_of_changes(wc_dir)
 
-  D_path = os.path.join(wc_dir, 'A', 'D')
+  D_path = sbox.ospath('A/D')
 
   # Create expected state.
   expected_output = svntest.wc.State(wc_dir, {
@@ -440,7 +440,7 @@ def commit_unversioned_thing(sbox):
   wc_dir = sbox.wc_dir
 
   # Create an unversioned file in the wc.
-  svntest.main.file_append(os.path.join(wc_dir, 'blorg'), "nothing to see")
+  svntest.main.file_append(sbox.ospath('blorg'), "nothing to see")
 
   # Commit a non-existent file and *expect* failure:
   svntest.actions.run_and_verify_commit(wc_dir,
@@ -459,7 +459,7 @@ def nested_dir_replacements(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  A_D = os.path.join(wc_dir, 'A', 'D')
+  A_D = sbox.ospath('A/D')
 
   # Delete and re-add A/D (a replacement), and A/D/H (another replace).
   svntest.main.run_svn(None, 'rm', A_D)
@@ -542,7 +542,7 @@ def hudson_part_1(sbox):
   wc_dir = sbox.wc_dir
 
   # Remove gamma from the working copy.
-  gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
+  gamma_path = sbox.ospath('A/D/gamma')
   svntest.main.run_svn(None, 'rm', gamma_path)
 
   # Create expected commit output.
@@ -593,7 +593,7 @@ def hudson_part_1_variation_1(sbox):
   wc_dir = sbox.wc_dir
 
   # Remove H from the working copy.
-  H_path = os.path.join(wc_dir, 'A', 'D', 'H')
+  H_path = sbox.ospath('A/D/H')
   svntest.main.run_svn(None, 'rm', H_path)
 
   # Create expected commit output.
@@ -644,7 +644,7 @@ def hudson_part_1_variation_2(sbox):
   wc_dir = sbox.wc_dir
 
   # Remove gamma from the working copy.
-  gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
+  gamma_path = sbox.ospath('A/D/gamma')
   svntest.main.run_svn(None, 'rm', gamma_path)
 
   # Create expected commit output.
@@ -703,8 +703,8 @@ def hudson_part_2(sbox):
   wc_dir = sbox.wc_dir
 
   # Remove gamma from the working copy.
-  D_path = os.path.join(wc_dir, 'A', 'D')
-  gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
+  D_path = sbox.ospath('A/D')
+  gamma_path = sbox.ospath('A/D/gamma')
   svntest.main.run_svn(None, 'rm', gamma_path)
 
   # Create expected commit output.
@@ -751,8 +751,8 @@ def hudson_part_2_1(sbox):
   wc_dir = sbox.wc_dir
 
   # Move all the files in H to G
-  H_path = os.path.join(wc_dir, 'A', 'D', 'H')
-  G_path = os.path.join(wc_dir, 'A', 'D', 'G')
+  H_path = sbox.ospath('A/D/H')
+  G_path = sbox.ospath('A/D/G')
   chi_path = os.path.join(H_path, 'chi')
   psi_path = os.path.join(H_path, 'psi')
   omega_path = os.path.join(H_path, 'omega')
@@ -842,7 +842,7 @@ fp.close()"""
                                          hook_format % "post_commit_hook")
 
   # Modify iota just so there is something to commit.
-  iota_path = os.path.join(wc_dir, "iota")
+  iota_path = sbox.ospath('iota')
   svntest.main.file_append(iota_path, "More stuff in iota")
 
   # Commit, no output expected.
@@ -880,10 +880,10 @@ def merge_mixed_revisions(sbox):
   wc_dir = sbox.wc_dir
 
   # Make some convenient paths.
-  iota_path = os.path.join(wc_dir, 'iota')
-  H_path = os.path.join(wc_dir, 'A', 'D', 'H')
-  chi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'chi')
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
+  iota_path = sbox.ospath('iota')
+  H_path = sbox.ospath('A/D/H')
+  chi_path = sbox.ospath('A/D/H/chi')
+  omega_path = sbox.ospath('A/D/H/omega')
 
   # Here's the reproduction formula, in 5 parts.
   # Hoo, what a buildup of state!
@@ -1029,15 +1029,15 @@ def commit_uri_unsafe(sbox):
     nasty_name = '#![]{}()<>%'
 
   # Make some convenient paths.
-  hash_dir = os.path.join(wc_dir, '#hash#')
+  hash_dir = sbox.ospath('#hash#')
   nasty_dir = os.path.join(wc_dir, nasty_name)
-  space_path = os.path.join(wc_dir, 'A', 'D', 'space path')
-  bang_path = os.path.join(wc_dir, 'A', 'D', 'H', 'bang!')
-  bracket_path = os.path.join(wc_dir, 'A', 'D', 'H', 'bra[ket')
-  brace_path = os.path.join(wc_dir, 'A', 'D', 'H', 'bra{e')
+  space_path = sbox.ospath('A/D/space path')
+  bang_path = sbox.ospath('A/D/H/bang!')
+  bracket_path = sbox.ospath('A/D/H/bra[ket')
+  brace_path = sbox.ospath('A/D/H/bra{e')
   angle_path = os.path.join(wc_dir, 'A', 'D', 'H', angle_name)
-  paren_path = os.path.join(wc_dir, 'A', 'D', 'pare)(theses')
-  percent_path = os.path.join(wc_dir, '#hash#', 'percen%')
+  paren_path = sbox.ospath('A/D/pare)(theses')
+  percent_path = sbox.ospath('#hash#/percen%')
   nasty_path = os.path.join(wc_dir, 'A', nasty_name)
 
   os.mkdir(hash_dir)
@@ -1099,8 +1099,8 @@ def commit_deleted_edited(sbox):
   wc_dir = sbox.wc_dir
 
   # Make some convenient paths.
-  iota_path = os.path.join(wc_dir, 'iota')
-  mu_path = os.path.join(wc_dir, 'A', 'mu')
+  iota_path = sbox.ospath('iota')
+  mu_path = sbox.ospath('A/mu')
 
   # Edit the files.
   svntest.main.file_append(iota_path, "This file has been edited.")
@@ -1134,10 +1134,10 @@ def commit_in_dir_scheduled_for_addition
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  A_path = os.path.join(wc_dir, 'A')
-  Z_path = os.path.join(wc_dir, 'Z')
+  A_path = sbox.ospath('A')
+  Z_path = sbox.ospath('Z')
   Z_abspath = os.path.abspath(Z_path)
-  mu_path = os.path.join(wc_dir, 'Z', 'mu')
+  mu_path = sbox.ospath('Z/mu')
 
   svntest.main.run_svn(None, 'move', A_path, Z_path)
 
@@ -1154,7 +1154,7 @@ def commit_in_dir_scheduled_for_addition
                                         "' is not known to exist in the",
                                         mu_path)
 
-  Q_path = os.path.join(wc_dir, 'Q')
+  Q_path = sbox.ospath('Q')
   Q_abspath = os.path.abspath(Q_path)
   bloo_path = os.path.join(Q_path, 'bloo')
 
@@ -1193,7 +1193,7 @@ def commit_rmd_and_deleted_file(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  mu_path = os.path.join(wc_dir, 'A', 'mu')
+  mu_path = sbox.ospath('A/mu')
 
   # 'svn remove' mu
   svntest.main.run_svn(None, 'rm', mu_path)
@@ -1214,7 +1214,7 @@ def commit_add_file_twice(sbox):
   wc_dir = sbox.wc_dir
 
   # Create a file
-  gloo_path = os.path.join(wc_dir, 'A', 'D', 'H', 'gloo')
+  gloo_path = sbox.ospath('A/D/H/gloo')
   svntest.main.file_append(gloo_path, "hello")
   svntest.main.run_svn(None, 'add', gloo_path)
 
@@ -1266,7 +1266,7 @@ def commit_from_long_dir(sbox):
   abs_wc_dir = os.path.realpath(os.path.join(was_dir, wc_dir))
 
   # something to commit
-  svntest.main.file_append(os.path.join(wc_dir, 'iota'), "modified iota")
+  svntest.main.file_append(sbox.ospath('iota'), "modified iota")
 
   # Create expected output tree.
   expected_output = svntest.wc.State('', {
@@ -1297,7 +1297,7 @@ def commit_with_lock(sbox):
   # modify gamma and lock its directory
   wc_dir = sbox.wc_dir
 
-  D_path = os.path.join(wc_dir, 'A', 'D')
+  D_path = sbox.ospath('A/D')
   gamma_path = os.path.join(D_path, 'gamma')
   svntest.main.file_append(gamma_path, "modified gamma")
   svntest.actions.lock_admin_dir(D_path)
@@ -1375,7 +1375,7 @@ def failed_commit(sbox):
   svntest.actions.duplicate_dir(wc_dir, other_wc_dir)
 
   # Make different changes in the two working copies
-  iota_path = os.path.join(wc_dir, "iota")
+  iota_path = sbox.ospath('iota')
   svntest.main.file_append(iota_path, "More stuff in iota")
 
   other_iota_path = os.path.join(other_wc_dir, "iota")
@@ -1414,7 +1414,7 @@ def commit_multiple_wc_nested(sbox):
   wc_dir = sbox.wc_dir
 
   # Checkout a second working copy
-  wc2_dir = os.path.join(wc_dir, 'A', 'wc2')
+  wc2_dir = sbox.ospath('A/wc2')
   url = sbox.repo_url
   svntest.actions.run_and_verify_svn("Output on stderr where none expected",
                                      svntest.verify.AnyOutput, [],
@@ -1422,7 +1422,7 @@ def commit_multiple_wc_nested(sbox):
                                      url, wc2_dir)
 
   # Modify both working copies
-  mu_path = os.path.join(wc_dir, 'A', 'mu')
+  mu_path = sbox.ospath('A/mu')
   svntest.main.file_append(mu_path, 'appended mu text')
   lambda2_path = os.path.join(wc2_dir, 'A', 'B', 'lambda')
   svntest.main.file_append(lambda2_path, 'appended lambda2 text')
@@ -1459,8 +1459,8 @@ def commit_multiple_wc(sbox):
   svntest.sandbox._cleanup_test_path(wc_dir)
 
   # Checkout two wcs
-  wc1_dir = os.path.join(wc_dir, 'wc1')
-  wc2_dir = os.path.join(wc_dir, 'wc2')
+  wc1_dir = sbox.ospath('wc1')
+  wc2_dir = sbox.ospath('wc2')
   url = sbox.repo_url
   svntest.actions.run_and_verify_svn("Output on stderr where none expected",
                                      svntest.verify.AnyOutput, [],
@@ -1515,8 +1515,8 @@ def commit_multiple_wc_multiple_repos(sb
   svntest.sandbox._cleanup_test_path(wc_dir)
 
   # Checkout two wcs
-  wc1_dir = os.path.join(wc_dir, 'wc1')
-  wc2_dir = os.path.join(wc_dir, 'wc2')
+  wc1_dir = sbox.ospath('wc1')
+  wc2_dir = sbox.ospath('wc2')
   svntest.actions.run_and_verify_svn("Output on stderr where none expected",
                                      svntest.verify.AnyOutput, [],
                                      'checkout',
@@ -1791,7 +1791,7 @@ def commit_out_of_date_deletions(sbox):
   wc_dir = sbox.wc_dir
 
   # Need another empty dir
-  I_path = os.path.join(wc_dir, 'A', 'I')
+  I_path = sbox.ospath('A/I')
   os.mkdir(I_path)
   svntest.main.run_svn(None, 'add', I_path)
   svntest.main.run_svn(None, 'ci', '-m', 'prep', wc_dir)
@@ -1802,19 +1802,19 @@ def commit_out_of_date_deletions(sbox):
   svntest.actions.duplicate_dir(wc_dir, wc_backup)
 
   # Edits in wc 1
-  C_path = os.path.join(wc_dir, 'A', 'C')
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
-  alpha_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
+  C_path = sbox.ospath('A/C')
+  omega_path = sbox.ospath('A/D/H/omega')
+  alpha_path = sbox.ospath('A/B/E/alpha')
   svntest.main.run_svn(None, 'propset', 'fooprop', 'foopropval', C_path)
   svntest.main.file_append(omega_path, 'appended omega text')
   svntest.main.run_svn(None, 'propset', 'fooprop', 'foopropval', alpha_path)
 
   # Deletions in wc 1
-  I_path = os.path.join(wc_dir, 'A', 'I')
-  F_path = os.path.join(wc_dir, 'A', 'B', 'F')
-  chi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'chi')
-  beta_path = os.path.join(wc_dir, 'A', 'B', 'E', 'beta')
-  psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
+  I_path = sbox.ospath('A/I')
+  F_path = sbox.ospath('A/B/F')
+  chi_path = sbox.ospath('A/D/H/chi')
+  beta_path = sbox.ospath('A/B/E/beta')
+  psi_path = sbox.ospath('A/D/H/psi')
   svntest.main.run_svn(None, 'rm', I_path, F_path, chi_path, beta_path,
                        psi_path)
 
@@ -1871,8 +1871,8 @@ def commit_with_bad_log_message(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  iota_path = os.path.join(wc_dir, 'iota')
-  log_msg_path = os.path.join(wc_dir, 'log-message')
+  iota_path = sbox.ospath('iota')
+  log_msg_path = sbox.ospath('log-message')
 
   # Make a random change, so there's something to commit.
   svntest.main.file_append(iota_path, 'fish')
@@ -1895,8 +1895,8 @@ def commit_with_mixed_line_endings(sbox)
 
   expected_status = make_standard_slew_of_changes(wc_dir)
 
-  iota_path = os.path.join(wc_dir, 'iota')
-  log_msg_path = os.path.join(wc_dir, 'log-message')
+  iota_path = sbox.ospath('iota')
+  log_msg_path = sbox.ospath('log-message')
 
   # Make a random change, so there's something to commit.
   svntest.main.file_append(iota_path, 'kebab')
@@ -1919,8 +1919,8 @@ def commit_with_mixed_line_endings_in_ig
 
   expected_status = make_standard_slew_of_changes(wc_dir)
 
-  iota_path = os.path.join(wc_dir, 'iota')
-  log_msg_path = os.path.join(wc_dir, 'log-message')
+  iota_path = sbox.ospath('iota')
+  log_msg_path = sbox.ospath('log-message')
 
   # Make a random change, so there's something to commit.
   svntest.main.file_append(iota_path, 'cheeseburger')
@@ -1990,7 +1990,7 @@ def mods_in_schedule_delete(sbox):
   wc_dir = sbox.wc_dir
 
   # Schedule a delete, then put in local mods
-  C_path = os.path.join(wc_dir, 'A', 'C')
+  C_path = sbox.ospath('A/C')
   svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
                                      'rm', C_path)
 
@@ -2026,8 +2026,8 @@ def tab_test(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  tab_file = os.path.join(wc_dir, 'A', "tab\tfile")
-  tab_dir  = os.path.join(wc_dir, 'A', "tab\tdir")
+  tab_file = sbox.ospath('A/tab\tfile')
+  tab_dir  = sbox.ospath('A/tab\tdir')
   source_url = sbox.repo_url + "/source_dir"
   tab_url = sbox.repo_url + "/tab%09dir"
 
@@ -2091,30 +2091,30 @@ def local_mods_are_not_commits(sbox):
   # copy wc->wc
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'cp', '-m', 'log msg',
-                                     os.path.join(wc_dir, 'iota'),
-                                     os.path.join(wc_dir, 'iota2'))
+                                     sbox.ospath('iota'),
+                                     sbox.ospath('iota2'))
 
   # copy repos->wc
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'cp', '-m', 'log msg',
                                      sbox.repo_url + "/iota",
-                                     os.path.join(wc_dir, 'iota2'))
+                                     sbox.ospath('iota2'))
 
   # delete
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'rm', '-m', 'log msg',
-                                     os.path.join(wc_dir, 'A', 'D', 'gamma'))
+                                     sbox.ospath('A/D/gamma'))
 
   # mkdir
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'mkdir', '-m', 'log msg',
-                                     os.path.join(wc_dir, 'newdir'))
+                                     sbox.ospath('newdir'))
 
   # rename
   svntest.actions.run_and_verify_svn(None, None, expected_error,
                                      'cp', '-m', 'log msg',
-                                     os.path.join(wc_dir, 'A', 'mu'),
-                                     os.path.join(wc_dir, 'A', 'yu'))
+                                     sbox.ospath('A/mu'),
+                                     sbox.ospath('A/yu'))
 
 
 #----------------------------------------------------------------------
@@ -2136,7 +2136,7 @@ def post_commit_hook_test(sbox):
   svntest.actions.create_failing_hook(repo_dir, "post-commit", error_msg)
 
   # Modify iota just so there is something to commit.
-  iota_path = os.path.join(wc_dir, "iota")
+  iota_path = sbox.ospath('iota')
   svntest.main.file_append(iota_path, "lakalakalakalaka")
 
   # Now, commit and examine the output (we happen to know that the
@@ -2163,7 +2163,7 @@ def commit_same_folder_in_targets(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  iota_path = os.path.join(wc_dir, 'iota')
+  iota_path = sbox.ospath('iota')
 
   svntest.main.file_append(iota_path, "added extra line to file iota")
 
@@ -2196,8 +2196,8 @@ def commit_inconsistent_eol(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  iota_path = os.path.join(wc_dir, 'iota')
-  mu_path = os.path.join(wc_dir, 'A', 'mu')
+  iota_path = sbox.ospath('iota')
+  mu_path = sbox.ospath('A/mu')
 
   svntest.main.run_svn(None, 'propset', 'svn:eol-style', 'native', iota_path)
   svntest.main.file_append_binary(iota_path,
@@ -2263,8 +2263,8 @@ def commit_with_revprop(sbox):
   wc_dir = sbox.wc_dir
   expected_status = make_standard_slew_of_changes(wc_dir)
 
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
-  gloo_path = os.path.join(wc_dir, 'A', 'D', 'H', 'gloo')
+  omega_path = sbox.ospath('A/D/H/omega')
+  gloo_path = sbox.ospath('A/D/H/gloo')
   expected_output = svntest.wc.State(wc_dir, {
     'A/D/H/omega' : Item(verb='Sending'),
     'A/D/H/gloo' : Item(verb='Adding'),
@@ -2296,8 +2296,8 @@ def import_with_revprop(sbox):
   "set revision props during import"
 
   sbox.build()
-  local_dir = os.path.join(sbox.wc_dir, 'folder')
-  local_file = os.path.join(sbox.wc_dir, 'folder', 'file')
+  local_dir = sbox.ospath('folder')
+  local_file = sbox.ospath('folder/file')
   os.mkdir(local_dir)
   svntest.main.file_write(local_file, "xxxx")
 
@@ -2345,7 +2345,7 @@ def copy_WC2R_with_revprop(sbox):
 
   sbox.build()
   remote_dir = sbox.repo_url + "/dir"
-  local_dir = os.path.join(sbox.wc_dir, 'folder')
+  local_dir = sbox.ospath('folder')
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'mkdir', local_dir)
 
@@ -2518,7 +2518,7 @@ def start_commit_hook_test(sbox):
   svntest.actions.create_failing_hook(repo_dir, "start-commit", error_msg)
 
   # Modify iota just so there is something to commit.
-  iota_path = os.path.join(wc_dir, "iota")
+  iota_path = sbox.ospath('iota')
   svntest.main.file_append(iota_path, "More stuff in iota")
 
   # Commit, expect error code 1
@@ -2558,7 +2558,7 @@ def pre_commit_hook_test(sbox):
   svntest.actions.create_failing_hook(repo_dir, "pre-commit", error_msg)
 
   # Modify iota just so there is something to commit.
-  iota_path = os.path.join(wc_dir, "iota")
+  iota_path = sbox.ospath('iota')
   svntest.main.file_append(iota_path, "More stuff in iota")
 
   # Commit, expect error code 1
@@ -2624,9 +2624,9 @@ def changelist_near_conflict(sbox):
   sbox.build()
 
   wc_dir = sbox.wc_dir
-  iota_path = os.path.join(wc_dir, "iota")
-  mu_path = os.path.join(wc_dir, "A", "mu")
-  gloo_path = os.path.join(wc_dir, "A", "D", "H", "gloo")
+  iota_path = sbox.ospath('iota')
+  mu_path = sbox.ospath('A/mu')
+  gloo_path = sbox.ospath('A/D/H/gloo')
 
   expected_status = make_standard_slew_of_changes(wc_dir)
 
@@ -2665,7 +2665,7 @@ def commit_out_of_date_file(sbox):
   wc_backup = sbox.add_wc_path('backup')
   svntest.actions.duplicate_dir(wc_dir, wc_backup)
 
-  pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
+  pi_path = sbox.ospath('A/D/G/pi')
   backup_pi_path = os.path.join(wc_backup, 'A', 'D', 'G', 'pi')
 
   svntest.main.file_append(pi_path, "new line\n")
@@ -2708,7 +2708,7 @@ def start_commit_detect_capabilities(sbo
   svntest.main.create_python_hook_script(start_commit_hook, hook_text)
 
   # Commit something.
-  iota_path = os.path.join(wc_dir, "iota")
+  iota_path = sbox.ospath('iota')
   svntest.main.file_append(iota_path, "More stuff in iota")
   svntest.actions.run_and_verify_svn(None, [], [], 'ci', '--quiet',
                                      '-m', 'log msg', wc_dir)
@@ -2730,9 +2730,9 @@ def commit_added_missing(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  mu_path = os.path.join(wc_dir, 'A', 'mu')
-  a_path = os.path.join(wc_dir, 'A', 'a.txt')
-  b_path = os.path.join(wc_dir, 'A', 'b.txt')
+  mu_path = sbox.ospath('A/mu')
+  a_path = sbox.ospath('A/a.txt')
+  b_path = sbox.ospath('A/b.txt')
 
   # Make two copies of mu: a and b
   svntest.main.run_svn(None, 'cp', mu_path, a_path)
@@ -2765,9 +2765,9 @@ def tree_conflicts_block_commit(sbox):
 
   svntest.actions.build_greek_tree_conflicts(sbox)
   wc_dir = sbox.wc_dir
-  A = os.path.join(wc_dir, 'A')
-  D = os.path.join(wc_dir, 'A', 'D')
-  G = os.path.join(wc_dir, 'A', 'D', 'G')
+  A = sbox.ospath('A')
+  D = sbox.ospath('A/D')
+  G = sbox.ospath('A/D/G')
 
   error_re = "remains in conflict"
   commit_fails_at_path(wc_dir, wc_dir, error_re)
@@ -2792,7 +2792,7 @@ def tree_conflicts_resolved(sbox):
   svntest.actions.duplicate_dir(wc_dir, wc_dir_2)
 
   # Mark the tree conflict victims as resolved
-  G = os.path.join(wc_dir, 'A', 'D', 'G')
+  G = sbox.ospath('A/D/G')
   victims = [ os.path.join(G, v) for v in ['pi', 'rho', 'tau'] ]
   svntest.actions.run_and_verify_resolved(victims)
 
@@ -2818,7 +2818,7 @@ def commit_multiple_nested_deletes(sbox)
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  A = os.path.join(wc_dir, 'A')
+  A = sbox.ospath('A')
   A_B = os.path.join(A, 'B')
 
   sbox.simple_rm('A')
@@ -2877,6 +2877,44 @@ def commit_add_subadd(sbox):
   svntest.main.run_svn(None, 'merge', '-c', '-2', './')
   svntest.main.run_svn(None, 'commit', '--targets', targets_file, '-mm')
 
+def commit_danglers(sbox):
+  "verify committing some dangling children fails"
+
+  sbox.build(read_only=True)
+  wc_dir = sbox.wc_dir
+
+  sbox.simple_copy('A','A_copied')
+
+  A_copied = sbox.ospath('A_copied')
+  mu_copied = sbox.ospath('A_copied/mu')
+
+  svntest.main.file_write(mu_copied, "xxxx")  
+
+  # We already test for this problem for some time
+  expected_error = "svn: E200009: '.*A_copied' .*exist.*yet.* '.*mu'.*part"
+  svntest.actions.run_and_verify_commit(mu_copied,
+                                        None,
+                                        None,
+                                        expected_error,
+                                        mu_copied)
+
+  # But now do the same thing via changelist filtering
+  svntest.main.run_svn(None, 'changelist', 'L', mu_copied, sbox.ospath('A/mu'))
+
+  # And try to commit A_copied itself with changelist filtering
+  svntest.actions.run_and_verify_commit(A_copied,
+                                        None,
+                                        None,
+                                        expected_error,
+                                        A_copied, '--cl', 'L')
+
+  # And on the wcroot
+  svntest.actions.run_and_verify_commit(wc_dir,
+                                        None,
+                                        None,
+                                        expected_error,
+                                        wc_dir, '--cl', 'L')
+
 
 ########################################################################
 # Run the tests
@@ -2947,6 +2985,7 @@ test_list = [ None,
               commit_multiple_nested_deletes,
               commit_incomplete,
               commit_add_subadd,
+              commit_danglers,
              ]
 
 if __name__ == '__main__':

Modified: subversion/branches/javahl-ra/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/copy_tests.py?rev=1343447&r1=1343446&r2=1343447&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/branches/javahl-ra/subversion/tests/cmdline/copy_tests.py Tue May 29 01:39:41 2012
@@ -63,7 +63,7 @@ or a url (when false) copy source is use
   wc_dir = sbox.wc_dir
 
   # File scheduled for deletion
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
+  rho_path = sbox.ospath('A/D/G/rho')
   svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
 
   # Status before attempting copies
@@ -73,7 +73,7 @@ or a url (when false) copy source is use
 
   # The copy shouldn't fail
   if wc_copy:
-    pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
+    pi_src = sbox.ospath('A/D/G/pi')
   else:
     pi_src = sbox.repo_url + '/A/D/G/pi'
 
@@ -107,12 +107,12 @@ def copy_replace_with_props(sbox, wc_cop
 
   # Use a temp file to set properties with wildcards in their values
   # otherwise Win32/VS2005 will expand them
-  prop_path = os.path.join(wc_dir, 'proptmp')
+  prop_path = sbox.ospath('proptmp')
   svntest.main.file_append(prop_path, '*')
 
   # Set props on file which is copy-source later on
-  pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
+  pi_path = sbox.ospath('A/D/G/pi')
+  rho_path = sbox.ospath('A/D/G/rho')
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'ps', 'phony-prop', '-F',
                                      prop_path, pi_path)
@@ -156,7 +156,7 @@ def copy_replace_with_props(sbox, wc_cop
 
   # The copy shouldn't fail
   if wc_copy:
-    pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
+    pi_src = sbox.ospath('A/D/G/pi')
   else:
     pi_src = sbox.repo_url + '/A/D/G/pi'
 
@@ -270,14 +270,14 @@ def basic_copy_and_move_files(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  mu_path = os.path.join(wc_dir, 'A', 'mu')
-  iota_path = os.path.join(wc_dir, 'iota')
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  D_path = os.path.join(wc_dir, 'A', 'D')
-  alpha_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
-  H_path = os.path.join(wc_dir, 'A', 'D', 'H')
-  F_path = os.path.join(wc_dir, 'A', 'B', 'F')
-  alpha2_path = os.path.join(wc_dir, 'A', 'C', 'alpha2')
+  mu_path = sbox.ospath('A/mu')
+  iota_path = sbox.ospath('iota')
+  rho_path = sbox.ospath('A/D/G/rho')
+  D_path = sbox.ospath('A/D')
+  alpha_path = sbox.ospath('A/B/E/alpha')
+  H_path = sbox.ospath('A/D/H')
+  F_path = sbox.ospath('A/B/F')
+  alpha2_path = sbox.ospath('A/C/alpha2')
 
   # Make local mods to mu and rho
   svntest.main.file_append(mu_path, 'appended mu text')
@@ -371,8 +371,8 @@ def receive_copy_in_update(sbox):
   svntest.actions.duplicate_dir(wc_dir, wc_backup)
 
   # Define a zillion paths in both working copies.
-  G_path = os.path.join(wc_dir, 'A', 'D', 'G')
-  newG_path = os.path.join(wc_dir, 'A', 'B', 'newG')
+  G_path = sbox.ospath('A/D/G')
+  newG_path = sbox.ospath('A/B/newG')
 
   # Copy directory A/D to A/B/newG
   svntest.actions.run_and_verify_svn(None, None, [], 'cp', G_path, newG_path)
@@ -449,7 +449,7 @@ def resurrect_deleted_dir(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  G_path = os.path.join(wc_dir, 'A', 'D', 'G')
+  G_path = sbox.ospath('A/D/G')
 
   # Delete directory A/D/G, commit that as r2.
   svntest.actions.run_and_verify_svn(None, None, [], 'rm', '--force',
@@ -502,7 +502,7 @@ def copy_deleted_dir_into_prefix(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  D_path = os.path.join(wc_dir, 'A', 'D')
+  D_path = sbox.ospath('A/D')
 
   # Delete directory A/D, commit that as r2.
   svntest.actions.run_and_verify_svn(None, None, [], 'rm', '--force',
@@ -577,7 +577,7 @@ def no_wc_copy_overwrites(sbox):
   wc_dir = sbox.wc_dir
 
   # File simply missing
-  tau_path = os.path.join(wc_dir, 'A', 'D', 'G', 'tau')
+  tau_path = sbox.ospath('A/D/G/tau')
   os.remove(tau_path)
 
   # Status before attempting copies
@@ -586,8 +586,8 @@ def no_wc_copy_overwrites(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # These copies should fail
-  pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
+  pi_path = sbox.ospath('A/D/G/pi')
+  rho_path = sbox.ospath('A/D/G/rho')
   svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
                                      'cp', pi_path, rho_path)
   svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
@@ -606,13 +606,13 @@ def copy_modify_commit(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  B_path = os.path.join(wc_dir, 'A', 'B')
-  B2_path = os.path.join(wc_dir, 'A', 'B2')
+  B_path = sbox.ospath('A/B')
+  B2_path = sbox.ospath('A/B2')
 
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
                                      B_path, B2_path)
 
-  alpha_path = os.path.join(wc_dir, 'A', 'B2', 'E', 'alpha')
+  alpha_path = sbox.ospath('A/B2/E/alpha')
   svntest.main.file_append(alpha_path, "modified alpha")
 
   expected_output = svntest.wc.State(wc_dir, {
@@ -638,7 +638,7 @@ def copy_files_with_properties(sbox):
   wc_dir = sbox.wc_dir
 
   # Set a property on a file
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
+  rho_path = sbox.ospath('A/D/G/rho')
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'propset', 'pname', 'pval', rho_path)
 
@@ -657,12 +657,12 @@ def copy_files_with_properties(sbox):
                                      'propset', 'pname2', 'pval2', rho_path)
 
   # WC to WC copy of file with committed and uncommitted properties
-  rho_wc_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho_wc')
+  rho_wc_path = sbox.ospath('A/D/G/rho_wc')
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'copy', rho_path, rho_wc_path)
 
   # REPOS to WC copy of file with properties
-  rho_url_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho_url')
+  rho_url_path = sbox.ospath('A/D/G/rho_url')
   rho_url = sbox.repo_url + '/A/D/G/rho'
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'copy', rho_url, rho_url_path)
@@ -708,16 +708,16 @@ def copy_delete_commit(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  B_path = os.path.join(wc_dir, 'A', 'B')
-  B2_path = os.path.join(wc_dir, 'A', 'B2')
+  B_path = sbox.ospath('A/B')
+  B2_path = sbox.ospath('A/B2')
 
   # copy a tree
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
                                      B_path, B2_path)
 
   # delete two files
-  lambda_path = os.path.join(wc_dir, 'A', 'B2', 'lambda')
-  alpha_path = os.path.join(wc_dir, 'A', 'B2', 'E', 'alpha')
+  lambda_path = sbox.ospath('A/B2/lambda')
+  alpha_path = sbox.ospath('A/B2/E/alpha')
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'rm', alpha_path, lambda_path)
 
@@ -735,11 +735,11 @@ def copy_delete_commit(sbox):
 
   # copy a tree
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
-                                     os.path.join(wc_dir, 'A', 'B'),
-                                     os.path.join(wc_dir, 'A', 'B3'))
+                                     sbox.ospath('A/B'),
+                                     sbox.ospath('A/B3'))
 
   # delete a directory
-  E_path = os.path.join(wc_dir, 'A', 'B3', 'E')
+  E_path = sbox.ospath('A/B3/E')
   svntest.actions.run_and_verify_svn(None, None, [], 'rm', E_path)
 
   # commit copied tree containing a deleted directory
@@ -761,8 +761,8 @@ def mv_and_revert_directory(sbox):
 
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
-  F_path = os.path.join(wc_dir, 'A', 'B', 'F')
+  E_path = sbox.ospath('A/B/E')
+  F_path = sbox.ospath('A/B/F')
   new_E_path = os.path.join(F_path, 'E')
 
   # Issue 931: move failed to lock the directory being deleted
@@ -797,8 +797,8 @@ def copy_preserve_executable_bit(sbox):
   wc_dir = sbox.wc_dir
 
   # Create two paths
-  newpath1 = os.path.join(wc_dir, 'newfile1')
-  newpath2 = os.path.join(wc_dir, 'newfile2')
+  newpath1 = sbox.ospath('newfile1')
+  newpath2 = sbox.ospath('newfile2')
 
   # Create the first file.
   svntest.main.file_append(newpath1, "a new file")
@@ -841,13 +841,13 @@ def wc_to_repos(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  beta_path = os.path.join(wc_dir, "A", "B", "E", "beta")
+  beta_path = sbox.ospath('A/B/E/beta')
   beta2_url = sbox.repo_url + "/A/B/E/beta2"
-  H_path = os.path.join(wc_dir, "A", "D", "H")
+  H_path = sbox.ospath('A/D/H')
   H2_url = sbox.repo_url + "/A/D/H2"
 
   # modify some items to be copied
-  svntest.main.file_append(os.path.join(wc_dir, 'A', 'D', 'H', 'omega'),
+  svntest.main.file_append(sbox.ospath('A/D/H/omega'),
                            "new otext\n")
   svntest.actions.run_and_verify_svn(None, None, [], 'propset', 'foo', 'bar',
                                      beta_path)
@@ -924,7 +924,7 @@ def repos_to_wc(sbox):
   # we should get some scheduled additions *with history*.
   E_url = sbox.repo_url + "/A/B/E"
   pi_url = sbox.repo_url + "/A/D/G/pi"
-  pi_path = os.path.join(wc_dir, 'pi')
+  pi_path = sbox.ospath('pi')
 
   svntest.actions.run_and_verify_svn(None, None, [], 'copy', E_url, wc_dir)
   svntest.actions.run_and_verify_svn(None, None, [], 'copy', pi_url, wc_dir)
@@ -956,7 +956,7 @@ def repos_to_wc(sbox):
   # Revert everything and verify.
   svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
 
-  svntest.main.safe_rmtree(os.path.join(wc_dir, 'E'))
+  svntest.main.safe_rmtree(sbox.ospath('E'))
 
   expected_output = svntest.actions.get_virginal_state(wc_dir, 1)
   svntest.actions.run_and_verify_status(wc_dir, expected_output)
@@ -976,7 +976,7 @@ def repos_to_wc(sbox):
   # Revert everything and verify.
   svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
 
-  svntest.main.safe_rmtree(os.path.join(wc_dir, 'C'))
+  svntest.main.safe_rmtree(sbox.ospath('C'))
 
   expected_output = svntest.actions.get_virginal_state(wc_dir, 1)
   svntest.actions.run_and_verify_status(wc_dir, expected_output)
@@ -1009,7 +1009,7 @@ def repos_to_wc(sbox):
   # Copy a directory to a pre-existing WC directory.
   # The source directory should be copied *under* the target directory.
   B_url = sbox.repo_url + "/A/B"
-  D_dir = os.path.join(wc_dir, 'A', 'D')
+  D_dir = sbox.ospath('A/D')
 
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'copy', B_url, D_dir)
@@ -1242,7 +1242,7 @@ def diff_repos_to_wc_copy(sbox):
   wc_dir = sbox.wc_dir
 
   iota_repos_path = sbox.repo_url + '/iota'
-  target_wc_path = os.path.join(wc_dir, 'new_file')
+  target_wc_path = sbox.ospath('new_file')
 
   # Copy a file from the repository to the working copy.
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
@@ -1266,8 +1266,8 @@ def repos_to_wc_copy_eol_keywords(sbox):
   wc_dir = sbox.wc_dir
 
   iota_repos_path = sbox.repo_url + '/iota'
-  iota_wc_path = os.path.join(wc_dir, 'iota')
-  target_wc_path = os.path.join(wc_dir, 'new_file')
+  iota_wc_path = sbox.ospath('iota')
+  target_wc_path = sbox.ospath('new_file')
 
   # Modify iota to make it checkworthy.
   svntest.main.file_write(iota_wc_path,
@@ -1323,7 +1323,7 @@ def revision_kinds_local_source(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  mu_path = os.path.join(wc_dir, 'A', 'mu')
+  mu_path = sbox.ospath('A/mu')
 
   # Make a file with different content in each revision and WC; BASE != HEAD.
   expected_output = svntest.wc.State(wc_dir, {
@@ -1385,8 +1385,8 @@ def copy_over_missing_file(sbox):
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
 
-  mu_path = os.path.join(wc_dir, 'A', 'mu')
-  iota_path = os.path.join(wc_dir, 'iota')
+  mu_path = sbox.ospath('A/mu')
+  iota_path = sbox.ospath('iota')
   iota_url = sbox.repo_url + "/iota"
 
   # Make the target missing.
@@ -1420,7 +1420,7 @@ def repos_to_wc_1634(sbox):
   wc_dir = sbox.wc_dir
 
   # First delete a subdirectory and commit.
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
+  E_path = sbox.ospath('A/B/E')
   svntest.actions.run_and_verify_svn(None, None, [], 'delete', E_path)
   expected_output = svntest.wc.State(wc_dir, {
     'A/B/E' : Item(verb='Deleting'),
@@ -1504,7 +1504,7 @@ def wc_to_wc_copy_between_different_repo
   # Attempt a copy between different repositories.
   exit_code, out, err = svntest.main.run_svn(1, 'cp',
                                              os.path.join(wc2_dir, 'A'),
-                                             os.path.join(wc_dir, 'A', 'B'))
+                                             sbox.ospath('A/B'))
   for line in err:
     if line.find("it is not from repository") != -1:
       break
@@ -1520,8 +1520,8 @@ def wc_to_wc_copy_deleted(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  B_path = os.path.join(wc_dir, 'A', 'B')
-  B2_path = os.path.join(wc_dir, 'A', 'B2')
+  B_path = sbox.ospath('A/B')
+  B2_path = sbox.ospath('A/B2')
 
   # Schedule for delete
   svntest.actions.run_and_verify_svn(None, None, [], 'rm',
@@ -1720,14 +1720,14 @@ def mixed_wc_to_url(sbox):
   wc_dir = sbox.wc_dir
   Z_url = sbox.repo_url + '/A/D/Z'
   Z2_url = sbox.repo_url + '/A/D/Z2'
-  G_path = os.path.join(wc_dir, 'A', 'D', 'G')
-  B_path = os.path.join(wc_dir, 'A', 'B')
-  X_path = os.path.join(wc_dir, 'A', 'D', 'G', 'X')
-  Y_path = os.path.join(wc_dir, 'A', 'D', 'G', 'Y')
-  E_path = os.path.join(wc_dir, 'A', 'D', 'G', 'X', 'E')
-  alpha_path = os.path.join(wc_dir, 'A', 'D', 'G', 'X', 'E', 'alpha')
-  pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
+  G_path = sbox.ospath('A/D/G')
+  B_path = sbox.ospath('A/B')
+  X_path = sbox.ospath('A/D/G/X')
+  Y_path = sbox.ospath('A/D/G/Y')
+  E_path = sbox.ospath('A/D/G/X/E')
+  alpha_path = sbox.ospath('A/D/G/X/E/alpha')
+  pi_path = sbox.ospath('A/D/G/pi')
+  rho_path = sbox.ospath('A/D/G/rho')
 
   # Remove A/D/G/pi, then commit that removal.
   svntest.actions.run_and_verify_svn(None, None, [], 'rm', pi_path)
@@ -1789,10 +1789,10 @@ def mixed_wc_to_url(sbox):
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'co', Z_url, wc_dir)
 
-  if os.path.exists(os.path.join(wc_dir, 'pi')):
+  if os.path.exists(sbox.ospath('pi')):
     raise svntest.Failure("Path 'pi' exists but should be gone.")
 
-  fp = open(os.path.join(wc_dir, 'rho'), 'r')
+  fp = open(sbox.ospath('rho'), 'r')
   found_it = 0
   for line in fp.readlines():
     if re.match("^Second modification to rho.", line):
@@ -1835,7 +1835,7 @@ def delete_replaced_file(sbox):
   wc_dir = sbox.wc_dir
 
   # File scheduled for deletion.
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
+  rho_path = sbox.ospath('A/D/G/rho')
   svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
 
   # Status before attempting copies
@@ -1844,7 +1844,7 @@ def delete_replaced_file(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Copy 'pi' over 'rho' with history.
-  pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
+  pi_src = sbox.ospath('A/D/G/pi')
   svntest.actions.run_and_verify_svn(None, None, [], 'cp', pi_src, rho_path)
 
   # Check that file copied.
@@ -1868,12 +1868,12 @@ def mv_unversioned_file(sbox):
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
 
-  unver_path_1 = os.path.join(wc_dir, 'unversioned1')
-  dest_path_1 = os.path.join(wc_dir, 'dest')
+  unver_path_1 = sbox.ospath('unversioned1')
+  dest_path_1 = sbox.ospath('dest')
   svntest.main.file_append(unver_path_1, "an unversioned file")
 
-  unver_path_2 = os.path.join(wc_dir, 'A', 'unversioned2')
-  dest_path_2 = os.path.join(wc_dir, 'A', 'dest_forced')
+  unver_path_2 = sbox.ospath('A/unversioned2')
+  dest_path_2 = sbox.ospath('A/dest_forced')
   svntest.main.file_append(unver_path_2, "another unversioned file")
 
   # Try to move an unversioned file.
@@ -1925,7 +1925,7 @@ def force_move(sbox):
   os.chdir(was_cwd)
 
   # check for the new content
-  file_handle = open(os.path.join(wc_dir, "dest"), "r")
+  file_handle = open(sbox.ospath('dest'), "r")
   modified_file_content = file_handle.readlines()
   file_handle.close()
   # Error if we dont find the modified contents...
@@ -1960,9 +1960,9 @@ def copy_copied_file_and_dir(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  rho_copy_path_1 = os.path.join(wc_dir, 'A', 'D', 'rho_copy_1')
-  rho_copy_path_2 = os.path.join(wc_dir, 'A', 'B', 'F', 'rho_copy_2')
+  rho_path = sbox.ospath('A/D/G/rho')
+  rho_copy_path_1 = sbox.ospath('A/D/rho_copy_1')
+  rho_copy_path_2 = sbox.ospath('A/B/F/rho_copy_2')
 
   # Copy A/D/G/rho to A/D/rho_copy_1
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
@@ -1972,9 +1972,9 @@ def copy_copied_file_and_dir(sbox):
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
                                      rho_copy_path_1, rho_copy_path_2)
 
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
-  E_path_copy_1 = os.path.join(wc_dir, 'A', 'B', 'F', 'E_copy_1')
-  E_path_copy_2 = os.path.join(wc_dir, 'A', 'D', 'G', 'E_copy_2')
+  E_path = sbox.ospath('A/B/E')
+  E_path_copy_1 = sbox.ospath('A/B/F/E_copy_1')
+  E_path_copy_2 = sbox.ospath('A/D/G/E_copy_2')
 
   # Copy A/B/E to A/B/F/E_copy_1
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
@@ -2018,9 +2018,9 @@ def move_copied_file_and_dir(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  rho_copy_path = os.path.join(wc_dir, 'A', 'D', 'rho_copy')
-  rho_copy_move_path = os.path.join(wc_dir, 'A', 'B', 'F', 'rho_copy_moved')
+  rho_path = sbox.ospath('A/D/G/rho')
+  rho_copy_path = sbox.ospath('A/D/rho_copy')
+  rho_copy_move_path = sbox.ospath('A/B/F/rho_copy_moved')
 
   # Copy A/D/G/rho to A/D/rho_copy
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
@@ -2030,9 +2030,9 @@ def move_copied_file_and_dir(sbox):
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      rho_copy_path, rho_copy_move_path)
 
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
-  E_path_copy = os.path.join(wc_dir, 'A', 'B', 'F', 'E_copy')
-  E_path_copy_move = os.path.join(wc_dir, 'A', 'D', 'G', 'E_copy_moved')
+  E_path = sbox.ospath('A/B/E')
+  E_path_copy = sbox.ospath('A/B/F/E_copy')
+  E_path_copy_move = sbox.ospath('A/D/G/E_copy_moved')
 
   # Copy A/B/E to A/B/F/E_copy
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
@@ -2073,9 +2073,9 @@ def move_moved_file_and_dir(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  rho_move_path = os.path.join(wc_dir, 'A', 'D', 'rho_moved')
-  rho_move_moved_path = os.path.join(wc_dir, 'A', 'B', 'F', 'rho_move_moved')
+  rho_path = sbox.ospath('A/D/G/rho')
+  rho_move_path = sbox.ospath('A/D/rho_moved')
+  rho_move_moved_path = sbox.ospath('A/B/F/rho_move_moved')
 
   # Move A/D/G/rho to A/D/rho_moved
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
@@ -2085,9 +2085,9 @@ def move_moved_file_and_dir(sbox):
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      rho_move_path, rho_move_moved_path)
 
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
-  E_path_moved = os.path.join(wc_dir, 'A', 'B', 'F', 'E_moved')
-  E_path_move_moved = os.path.join(wc_dir, 'A', 'D', 'G', 'E_move_moved')
+  E_path = sbox.ospath('A/B/E')
+  E_path_moved = sbox.ospath('A/B/F/E_moved')
+  E_path_move_moved = sbox.ospath('A/D/G/E_move_moved')
 
   # Copy A/B/E to A/B/F/E_moved
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
@@ -2132,14 +2132,14 @@ def move_file_within_moved_dir(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  D_path = os.path.join(wc_dir, 'A', 'D')
-  D_path_moved = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved')
+  D_path = sbox.ospath('A/D')
+  D_path_moved = sbox.ospath('A/B/F/D_moved')
 
   # Move A/B/D to A/B/F/D_moved
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      D_path, D_path_moved)
 
-  chi_path = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved', 'H', 'chi')
+  chi_path = sbox.ospath('A/B/F/D_moved/H/chi')
   chi_moved_path = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved',
                                 'H', 'chi_moved')
   chi_moved_again_path = os.path.join(wc_dir, 'A', 'B', 'F',
@@ -2201,17 +2201,17 @@ def move_file_out_of_moved_dir(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  D_path = os.path.join(wc_dir, 'A', 'D')
-  D_path_moved = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved')
+  D_path = sbox.ospath('A/D')
+  D_path_moved = sbox.ospath('A/B/F/D_moved')
 
   # Move A/B/D to A/B/F/D_moved
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      D_path, D_path_moved)
 
-  chi_path = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved', 'H', 'chi')
+  chi_path = sbox.ospath('A/B/F/D_moved/H/chi')
   chi_moved_path = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved',
                                 'H', 'chi_moved')
-  chi_moved_again_path = os.path.join(wc_dir, 'A', 'C', 'chi_moved_again')
+  chi_moved_again_path = sbox.ospath('A/C/chi_moved_again')
 
   # Move A/B/F/D_moved/H/chi to A/B/F/D_moved/H/chi_moved
   # then move that to A/C/chi_moved_again
@@ -2269,15 +2269,15 @@ def move_dir_within_moved_dir(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  D_path = os.path.join(wc_dir, 'A', 'D')
-  D_path_moved = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved')
+  D_path = sbox.ospath('A/D')
+  D_path_moved = sbox.ospath('A/B/F/D_moved')
 
   # Move A/D to A/B/F/D_moved
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      D_path, D_path_moved)
 
-  H_path = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved', 'H')
-  H_moved_path = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved', 'H_moved')
+  H_path = sbox.ospath('A/B/F/D_moved/H')
+  H_moved_path = sbox.ospath('A/B/F/D_moved/H_moved')
   H_moved_again_path = os.path.join(wc_dir, 'A', 'B', 'F',
                                     'D_moved', 'H_moved_again')
 
@@ -2337,16 +2337,16 @@ def move_dir_out_of_moved_dir(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  D_path = os.path.join(wc_dir, 'A', 'D')
-  D_path_moved = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved')
+  D_path = sbox.ospath('A/D')
+  D_path_moved = sbox.ospath('A/B/F/D_moved')
 
   # Move A/D to A/B/F/D_moved
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      D_path, D_path_moved)
 
-  H_path = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved', 'H')
-  H_moved_path = os.path.join(wc_dir, 'A', 'B', 'F', 'D_moved', 'H_moved')
-  H_moved_again_path = os.path.join(wc_dir, 'A', 'C', 'H_moved_again')
+  H_path = sbox.ospath('A/B/F/D_moved/H')
+  H_moved_path = sbox.ospath('A/B/F/D_moved/H_moved')
+  H_moved_again_path = sbox.ospath('A/C/H_moved_again')
 
   # Move A/B/F/D_moved/H to A/B/F/D_moved/H_moved
   # then move that to A/C/H_moved_again
@@ -2406,8 +2406,8 @@ def move_file_back_and_forth(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  rho_move_path = os.path.join(wc_dir, 'A', 'D', 'rho_moved')
+  rho_path = sbox.ospath('A/D/G/rho')
+  rho_move_path = sbox.ospath('A/D/rho_moved')
 
   # Move A/D/G/rho away from and then back to its original path
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
@@ -2446,8 +2446,8 @@ def move_dir_back_and_forth(sbox):
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
 
-  D_path = os.path.join(wc_dir, 'A', 'D')
-  D_move_path = os.path.join(wc_dir, 'D_moved')
+  D_path = sbox.ospath('A/D')
+  D_move_path = sbox.ospath('D_moved')
 
   # Move A/D to D_moved
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
@@ -2492,12 +2492,12 @@ def copy_move_added_paths(sbox):
   wc_dir = sbox.wc_dir
 
   # Create a new file and schedule it for addition
-  upsilon_path = os.path.join(wc_dir, 'A', 'D', 'upsilon')
+  upsilon_path = sbox.ospath('A/D/upsilon')
   svntest.main.file_write(upsilon_path, "This is the file 'upsilon'\n")
   svntest.actions.run_and_verify_svn(None, None, [], 'add', upsilon_path)
 
   # Create a dir with children and schedule it for addition
-  I_path = os.path.join(wc_dir, 'A', 'D', 'I')
+  I_path = sbox.ospath('A/D/I')
   J_path = os.path.join(I_path, 'J')
   eta_path = os.path.join(I_path, 'eta')
   theta_path = os.path.join(I_path, 'theta')
@@ -2510,7 +2510,7 @@ def copy_move_added_paths(sbox):
   svntest.actions.run_and_verify_svn(None, None, [], 'add', I_path)
 
   # Create another dir and schedule it for addition
-  K_path = os.path.join(wc_dir, 'K')
+  K_path = sbox.ospath('K')
   os.mkdir(K_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'add', K_path)
 
@@ -2549,8 +2549,8 @@ def copy_move_added_paths(sbox):
 
   # Move added file A/D/upsilon to upsilon,
   # then move it again to A/upsilon
-  upsilon_move_path = os.path.join(wc_dir, 'upsilon')
-  upsilon_move_path_2 = os.path.join(wc_dir, 'A', 'upsilon')
+  upsilon_move_path = sbox.ospath('upsilon')
+  upsilon_move_path_2 = sbox.ospath('A/upsilon')
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      upsilon_path, upsilon_move_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
@@ -2558,8 +2558,8 @@ def copy_move_added_paths(sbox):
 
   # Move added dir A/D/I to A/B/I,
   # then move it again to A/D/H/I
-  I_move_path = os.path.join(wc_dir, 'A', 'B', 'I')
-  I_move_path_2 = os.path.join(wc_dir, 'A', 'D', 'H', 'I')
+  I_move_path = sbox.ospath('A/B/I')
+  I_move_path_2 = sbox.ospath('A/D/H/I')
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
                                      I_path, I_move_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
@@ -2609,15 +2609,15 @@ def copy_move_added_paths(sbox):
   # Run_and_verify_commit() doesn't handle status of unversioned paths
   # so manually confirm unversioned paths got copied and moved too.
   unversioned_paths = [
-    os.path.join(wc_dir, 'A', 'D', 'H', 'I', 'unversioned1'),
-    os.path.join(wc_dir, 'A', 'D', 'H', 'I', 'L_UNVERSIONED'),
+    sbox.ospath('A/D/H/I/unversioned1'),
+    sbox.ospath('A/D/H/I/L_UNVERSIONED'),
     os.path.join(wc_dir, 'A', 'D', 'H', 'I', 'L_UNVERSIONED',
                  'unversioned3'),
-    os.path.join(wc_dir, 'A', 'D', 'H', 'I', 'J', 'unversioned2'),
-    os.path.join(wc_dir, 'K', 'I', 'unversioned1'),
-    os.path.join(wc_dir, 'K', 'I', 'L_UNVERSIONED'),
-    os.path.join(wc_dir, 'K', 'I', 'L_UNVERSIONED', 'unversioned3'),
-    os.path.join(wc_dir, 'K', 'I', 'J', 'unversioned2')]
+    sbox.ospath('A/D/H/I/J/unversioned2'),
+    sbox.ospath('K/I/unversioned1'),
+    sbox.ospath('K/I/L_UNVERSIONED'),
+    sbox.ospath('K/I/L_UNVERSIONED/unversioned3'),
+    sbox.ospath('K/I/J/unversioned2')]
   for path in unversioned_paths:
     if not os.path.exists(path):
       raise svntest.Failure("Unversioned path '%s' not found." % path)
@@ -2629,14 +2629,14 @@ def copy_added_paths_with_props(sbox):
   wc_dir = sbox.wc_dir
 
   # Create a new file, schedule it for addition and set properties
-  upsilon_path = os.path.join(wc_dir, 'A', 'D', 'upsilon')
+  upsilon_path = sbox.ospath('A/D/upsilon')
   svntest.main.file_write(upsilon_path, "This is the file 'upsilon'\n")
   svntest.actions.run_and_verify_svn(None, None, [], 'add', upsilon_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'propset',
                                      'foo', 'bar', upsilon_path)
 
   # Create a dir and schedule it for addition and set properties
-  I_path = os.path.join(wc_dir, 'A', 'D', 'I')
+  I_path = sbox.ospath('A/D/I')
   os.mkdir(I_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'add', I_path)
   svntest.actions.run_and_verify_svn(None, None, [], 'propset',
@@ -2665,12 +2665,12 @@ def copy_added_paths_with_props(sbox):
                              expected_disk.old_tree())
 
   # Copy added dir I to dir A/C
-  I_copy_path = os.path.join(wc_dir, 'A', 'C', 'I')
+  I_copy_path = sbox.ospath('A/C/I')
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
                                      I_path, I_copy_path)
 
   # Copy added file A/upsilon into dir A/C
-  upsilon_copy_path = os.path.join(wc_dir, 'A', 'C', 'upsilon')
+  upsilon_copy_path = sbox.ospath('A/C/upsilon')
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
                                      upsilon_path, upsilon_copy_path)
 
@@ -2717,12 +2717,12 @@ def copy_added_paths_to_URL(sbox):
   wc_dir = sbox.wc_dir
 
   # Create a new file and schedule it for addition
-  upsilon_path = os.path.join(wc_dir, 'A', 'D', 'upsilon')
+  upsilon_path = sbox.ospath('A/D/upsilon')
   svntest.main.file_write(upsilon_path, "This is the file 'upsilon'\n")
   svntest.actions.run_and_verify_svn(None, None, [], 'add', upsilon_path)
 
   # Create a dir with children and schedule it for addition
-  I_path = os.path.join(wc_dir, 'A', 'D', 'I')
+  I_path = sbox.ospath('A/D/I')
   J_path = os.path.join(I_path, 'J')
   eta_path = os.path.join(I_path, 'eta')
   theta_path = os.path.join(I_path, 'theta')
@@ -2859,7 +2859,7 @@ def move_to_relative_paths(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
+  E_path = sbox.ospath('A/B/E')
   rel_path = os.path.join('..', '..', '..')
 
   current_dir = os.getcwd()
@@ -2881,7 +2881,7 @@ def move_from_relative_paths(sbox):
 
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
-  F_path = os.path.join(wc_dir, 'A', 'B', 'F')
+  F_path = sbox.ospath('A/B/F')
   beta_rel_path = os.path.join('..', 'E', 'beta')
 
   current_dir = os.getcwd()
@@ -2903,7 +2903,7 @@ def copy_to_relative_paths(sbox):
 
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
+  E_path = sbox.ospath('A/B/E')
   rel_path = os.path.join('..', '..', '..')
 
   current_dir = os.getcwd()
@@ -2924,7 +2924,7 @@ def copy_from_relative_paths(sbox):
 
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
-  F_path = os.path.join(wc_dir, 'A', 'B', 'F')
+  F_path = sbox.ospath('A/B/F')
   beta_rel_path = os.path.join('..', 'E', 'beta')
 
   current_dir = os.getcwd()
@@ -2949,11 +2949,11 @@ def move_multiple_wc(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  chi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'chi')
-  psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
-  C_path = os.path.join(wc_dir, 'A', 'C')
+  chi_path = sbox.ospath('A/D/H/chi')
+  psi_path = sbox.ospath('A/D/H/psi')
+  omega_path = sbox.ospath('A/D/H/omega')
+  E_path = sbox.ospath('A/B/E')
+  C_path = sbox.ospath('A/C')
 
   # Move chi, psi, omega and E to A/C
   svntest.actions.run_and_verify_svn(None, None, [], 'mv', chi_path, psi_path,
@@ -3004,11 +3004,11 @@ def copy_multiple_wc(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  chi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'chi')
-  psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
-  C_path = os.path.join(wc_dir, 'A', 'C')
+  chi_path = sbox.ospath('A/D/H/chi')
+  psi_path = sbox.ospath('A/D/H/psi')
+  omega_path = sbox.ospath('A/D/H/omega')
+  E_path = sbox.ospath('A/B/E')
+  C_path = sbox.ospath('A/C')
 
   # Copy chi, psi, omega and E to A/C
   svntest.actions.run_and_verify_svn(None, None, [], 'cp', chi_path, psi_path,
@@ -3179,7 +3179,7 @@ def copy_multiple_repo_wc(sbox):
   psi_url = sbox.repo_url + '/A/D/H/psi'
   omega_with_space_url = sbox.repo_url + '/A/D/H/omega 2'
   E_url = sbox.repo_url + '/A/B/E'
-  C_path = os.path.join(wc_dir, 'A', 'C')
+  C_path = sbox.ospath('A/C')
 
   # We need this in order to check that we don't end up with URI-encoded
   # paths in the WC (issue #2955)
@@ -3225,10 +3225,10 @@ def copy_multiple_wc_repo(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  chi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'chi')
-  psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
-  omega_path = os.path.join(wc_dir, 'A', 'D', 'H', 'omega')
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
+  chi_path = sbox.ospath('A/D/H/chi')
+  psi_path = sbox.ospath('A/D/H/psi')
+  omega_path = sbox.ospath('A/D/H/omega')
+  E_path = sbox.ospath('A/B/E')
   C_url = sbox.repo_url + '/A/C'
 
   # Perform the copy and check the output
@@ -3283,10 +3283,10 @@ def copy_peg_rev_local_files(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
-  new_iota_path = os.path.join(wc_dir, 'new_iota')
-  iota_path = os.path.join(wc_dir, 'iota')
-  sigma_path = os.path.join(wc_dir, 'sigma')
+  psi_path = sbox.ospath('A/D/H/psi')
+  new_iota_path = sbox.ospath('new_iota')
+  iota_path = sbox.ospath('iota')
+  sigma_path = sbox.ospath('sigma')
 
   psi_text = "This is the file 'psi'.\n"
   iota_text = "This is the file 'iota'.\n"
@@ -3340,10 +3340,10 @@ def copy_peg_rev_local_dirs(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  E_path = os.path.join(wc_dir, 'A', 'B', 'E')
-  G_path = os.path.join(wc_dir, 'A', 'D', 'G')
-  I_path = os.path.join(wc_dir, 'A', 'D', 'I')
-  J_path = os.path.join(wc_dir, 'A', 'J')
+  E_path = sbox.ospath('A/B/E')
+  G_path = sbox.ospath('A/D/G')
+  I_path = sbox.ospath('A/D/I')
+  J_path = sbox.ospath('A/J')
   alpha_path = os.path.join(E_path, 'alpha')
 
   # Make some changes to the repository
@@ -3423,9 +3423,9 @@ def copy_peg_rev_url(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  psi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'psi')
-  new_iota_path = os.path.join(wc_dir, 'new_iota')
-  iota_path = os.path.join(wc_dir, 'iota')
+  psi_path = sbox.ospath('A/D/H/psi')
+  new_iota_path = sbox.ospath('new_iota')
+  iota_path = sbox.ospath('iota')
   iota_url = sbox.repo_url + '/iota'
   sigma_url = sbox.repo_url + '/sigma'
 
@@ -3486,8 +3486,8 @@ def old_dir_wc_to_wc(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  E = os.path.join(wc_dir, 'A', 'B', 'E')
-  E2 = os.path.join(wc_dir, 'E2')
+  E = sbox.ospath('A/B/E')
+  E2 = sbox.ospath('E2')
   E_url = sbox.repo_url + '/A/B/E'
   alpha_url = E_url + '/alpha'
 
@@ -3532,8 +3532,8 @@ def copy_make_parents_wc_wc(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  iota_path = os.path.join(wc_dir, 'iota')
-  new_iota_path = os.path.join(wc_dir, 'X', 'Y', 'Z', 'iota')
+  iota_path = sbox.ospath('iota')
+  new_iota_path = sbox.ospath('X/Y/Z/iota')
 
   # Copy iota
   svntest.actions.run_and_verify_svn(None, None, [], 'cp', '--parents',
@@ -3574,7 +3574,7 @@ def copy_make_parents_repo_wc(sbox):
   wc_dir = sbox.wc_dir
 
   iota_url = sbox.repo_url + '/iota'
-  new_iota_path = os.path.join(wc_dir, 'X', 'Y', 'Z', 'iota')
+  new_iota_path = sbox.ospath('X/Y/Z/iota')
 
   # Copy iota
   svntest.actions.run_and_verify_svn(None, None, [],
@@ -3616,7 +3616,7 @@ def copy_make_parents_wc_repo(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  iota_path = os.path.join(wc_dir, 'iota')
+  iota_path = sbox.ospath('iota')
   new_iota_url = sbox.repo_url + '/X/Y/Z/iota'
 
   # Copy iota
@@ -3807,7 +3807,7 @@ def allow_unversioned_parent_for_copy_sr
   # Make the "other" working copy
   wc2_dir = sbox.add_wc_path('other')
   svntest.actions.duplicate_dir(wc_dir, wc2_dir)
-  copy_to_path = os.path.join(wc_dir, 'A', 'copy_of_wc2')
+  copy_to_path = sbox.ospath('A/copy_of_wc2')
 
   # Copy the wc-in-unversioned-parent working copy to our original wc.
   svntest.actions.run_and_verify_svn(None,
@@ -3917,8 +3917,8 @@ def copy_into_absent_dir(sbox):
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
 
-  A_path = os.path.join(wc_dir, 'A')
-  iota_path = os.path.join(wc_dir, 'iota')
+  A_path = sbox.ospath('A')
+  iota_path = sbox.ospath('iota')
 
   # Remove 'A'
   svntest.main.safe_rmtree(A_path)
@@ -3969,8 +3969,8 @@ def find_copyfrom_information_upstairs(s
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  A_path = os.path.join(wc_dir, 'A')
-  A2_path = os.path.join(wc_dir, 'A2')
+  A_path = sbox.ospath('A')
+  A2_path = sbox.ospath('A2')
   B2_path = os.path.join(A2_path, 'B')
 
   svntest.actions.run_and_verify_svn(None, None, [], 'cp', A_path, A2_path)
@@ -4021,25 +4021,25 @@ def path_move_and_copy_between_wcs_2475(
                           expected_wc)
 
   # Copy a file from wc to wc2
-  mu_path = os.path.join(sbox.wc_dir, 'A', 'mu')
+  mu_path = sbox.ospath('A/mu')
   E_path = os.path.join(wc2_dir, 'A', 'B', 'E')
 
   svntest.main.run_svn(None, 'cp', mu_path, E_path)
 
   # Copy a folder from wc to wc2
-  C_path = os.path.join(sbox.wc_dir, 'A', 'C')
+  C_path = sbox.ospath('A/C')
   B_path = os.path.join(wc2_dir, 'A', 'B')
 
   svntest.main.run_svn(None, 'cp', C_path, B_path)
 
   # Move a file from wc to wc2
-  mu_path = os.path.join(sbox.wc_dir, 'A', 'mu')
+  mu_path = sbox.ospath('A/mu')
   B_path = os.path.join(wc2_dir, 'A', 'B')
 
   svntest.main.run_svn(None, 'mv', mu_path, B_path)
 
   # Move a folder from wc to wc2
-  C_path = os.path.join(sbox.wc_dir, 'A', 'C')
+  C_path = sbox.ospath('A/C')
   D_path = os.path.join(wc2_dir, 'A', 'D')
 
   svntest.main.run_svn(None, 'mv', C_path, D_path)
@@ -4095,8 +4095,8 @@ def commit_copy_depth_empty(sbox):
   "copy a wcdir, then commit it with --depth empty"
   sbox.build()
 
-  a = os.path.join(sbox.wc_dir, 'A')
-  new_a = os.path.join(sbox.wc_dir, 'new_A')
+  a = sbox.ospath('A')
+  new_a = sbox.ospath('new_A')
 
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'cp', a, new_a)
@@ -4109,8 +4109,8 @@ def copy_below_copy(sbox):
   "copy a dir below a copied dir"
   sbox.build()
 
-  A = os.path.join(sbox.wc_dir, 'A')
-  new_A = os.path.join(sbox.wc_dir, 'new_A')
+  A = sbox.ospath('A')
+  new_A = sbox.ospath('new_A')
   new_A_D = os.path.join(new_A, 'D')
   new_A_new_D = os.path.join(new_A, 'new_D')
   new_A_mu = os.path.join(new_A, 'mu')
@@ -4173,8 +4173,8 @@ def move_below_move(sbox):
   "move a dir below a moved dir"
   sbox.build()
 
-  A = os.path.join(sbox.wc_dir, 'A')
-  new_A = os.path.join(sbox.wc_dir, 'new_A')
+  A = sbox.ospath('A')
+  new_A = sbox.ospath('new_A')
   new_A_D = os.path.join(new_A, 'D')
   new_A_new_D = os.path.join(new_A, 'new_D')
   new_A_mu = os.path.join(new_A, 'mu')
@@ -4239,7 +4239,7 @@ def reverse_merge_move(sbox):
   rav_svn = svntest.actions.run_and_verify_svn
 
   wc_dir = sbox.wc_dir
-  a_dir = os.path.join(wc_dir, 'A')
+  a_dir = sbox.ospath('A')
   a_repo_url = sbox.repo_url + '/A'
   sbox.build()
 
@@ -4292,12 +4292,12 @@ def nonrecursive_commit_of_copy(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  main.run_svn(None, 'cp', os.path.join(wc_dir, 'A'),
-               os.path.join(wc_dir, 'A_new'))
-  main.run_svn(None, 'cp', os.path.join(wc_dir, 'A/D/G'),
-               os.path.join(wc_dir, 'A_new/G_new'))
-  main.run_svn(None, 'rm', os.path.join(wc_dir, 'A_new/C'))
-  main.run_svn(None, 'rm', os.path.join(wc_dir, 'A_new/B/E'))
+  main.run_svn(None, 'cp', sbox.ospath('A'),
+               sbox.ospath('A_new'))
+  main.run_svn(None, 'cp', sbox.ospath('A/D/G'),
+               sbox.ospath('A_new/G_new'))
+  main.run_svn(None, 'rm', sbox.ospath('A_new/C'))
+  main.run_svn(None, 'rm', sbox.ospath('A_new/B/E'))
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.add({
@@ -4362,14 +4362,14 @@ def copy_added_dir_with_copy(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  new_dir = os.path.join(wc_dir, 'NewDir');
-  new_dir2 = os.path.join(wc_dir, 'NewDir2');
+  new_dir = sbox.ospath('NewDir');
+  new_dir2 = sbox.ospath('NewDir2');
 
   # Alias for svntest.actions.run_and_verify_svn
   rav_svn = svntest.actions.run_and_verify_svn
 
   rav_svn(None, None, [], 'mkdir', new_dir)
-  rav_svn(None, None, [], 'cp', os.path.join(wc_dir, 'A', 'mu'), new_dir)
+  rav_svn(None, None, [], 'cp', sbox.ospath('A/mu'), new_dir)
   rav_svn(None, None, [], 'cp', new_dir, new_dir2)
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -4395,8 +4395,8 @@ def copy_broken_symlink(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  new_symlink = os.path.join(wc_dir, 'new_symlink');
-  copied_symlink = os.path.join(wc_dir, 'copied_symlink');
+  new_symlink = sbox.ospath('new_symlink');
+  copied_symlink = sbox.ospath('copied_symlink');
   os.symlink('linktarget', new_symlink)
 
   # Alias for svntest.actions.run_and_verify_svn
@@ -4516,12 +4516,12 @@ def copy_dir_with_space(sbox):
   wc_dir = sbox.wc_dir
 
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
-                                     os.path.join(wc_dir, 'A', 'B', 'E'),
-                                     os.path.join(wc_dir, 'E with spaces'))
+                                     sbox.ospath('A/B/E'),
+                                     sbox.ospath('E with spaces'))
 
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
-                                     os.path.join(wc_dir, 'A', 'B', 'E', 'alpha'),
-                                     os.path.join(wc_dir, 'E with spaces', 'al pha'))
+                                     sbox.ospath('A/B/E/alpha'),
+                                     sbox.ospath('E with spaces/al pha'))
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_output = svntest.wc.State(wc_dir, {
@@ -4540,13 +4540,13 @@ def copy_dir_with_space(sbox):
                                         None, wc_dir)
 
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
-                                     os.path.join(wc_dir, 'E with spaces'),
-                                     os.path.join(wc_dir, 'E also spaces')
+                                     sbox.ospath('E with spaces'),
+                                     sbox.ospath('E also spaces')
                                      )
 
   svntest.actions.run_and_verify_svn(None, None, [], 'cp',
-                                     os.path.join(wc_dir, 'E with spaces/al pha'),
-                                     os.path.join(wc_dir, 'E also spaces/al b')
+                                     sbox.ospath('E with spaces/al pha'),
+                                     sbox.ospath('E also spaces/al b')
                                      )
 
   expected_output = svntest.wc.State(wc_dir, {
@@ -4566,13 +4566,13 @@ def copy_dir_with_space(sbox):
                                         None, wc_dir)
 
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
-                                     os.path.join(wc_dir, 'E with spaces'),
-                                     os.path.join(wc_dir, 'E new spaces')
+                                     sbox.ospath('E with spaces'),
+                                     sbox.ospath('E new spaces')
                                      )
 
   svntest.actions.run_and_verify_svn(None, None, [], 'mv',
-                                     os.path.join(wc_dir, 'E new spaces/al pha'),
-                                     os.path.join(wc_dir, 'E also spaces/al c')
+                                     sbox.ospath('E new spaces/al pha'),
+                                     sbox.ospath('E also spaces/al c')
                                      )
 
   expected_output = svntest.wc.State(wc_dir, {
@@ -4605,8 +4605,8 @@ def changed_data_should_match_checkout(s
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  A_B_E = os.path.join(wc_dir, 'A', 'B', 'E')
-  E_new = os.path.join(wc_dir, 'E_new')
+  A_B_E = sbox.ospath('A/B/E')
+  E_new = sbox.ospath('E_new')
 
   verify_dir = sbox.add_wc_path('verify')
 
@@ -4636,8 +4636,8 @@ def changed_dir_data_should_match_checko
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  A_B = os.path.join(wc_dir, 'A', 'B')
-  B_new = os.path.join(wc_dir, 'B_new')
+  A_B = sbox.ospath('A/B')
+  B_new = sbox.ospath('B_new')
 
   verify_dir = sbox.add_wc_path('verify')
 
@@ -4706,9 +4706,9 @@ def copy_over_deleted_dir(sbox):
   "copy a directory over a deleted directory"
   sbox.build(read_only = True)
 
-  main.run_svn(None, 'rm', os.path.join(sbox.wc_dir, 'A/B'))
-  main.run_svn(None, 'cp', os.path.join(sbox.wc_dir, 'A/D'),
-               os.path.join(sbox.wc_dir, 'A/B'))
+  main.run_svn(None, 'rm', sbox.ospath('A/B'))
+  main.run_svn(None, 'cp', sbox.ospath('A/D'),
+               sbox.ospath('A/B'))
 
 @Issue(3314)
 def mixed_rev_copy_del(sbox):
@@ -4805,7 +4805,7 @@ def copy_delete_undo(sbox, use_revert):
   if (use_revert):
     svntest.main.run_svn(wc_dir, 'revert', '--recursive',
                          sbox.ospath('A/B/E-copied'))
-    svntest.main.safe_rmtree(os.path.join(wc_dir, 'A/B/E-copied'))
+    svntest.main.safe_rmtree(sbox.ospath('A/B/E-copied'))
   else:
     svntest.main.run_svn(wc_dir, 'rm', '--force', sbox.ospath('A/B/E-copied'))
   expected_status.remove('A/B/E-copied',
@@ -4953,7 +4953,7 @@ def copy_wc_over_deleted_other_kind(sbox
 def move_wc_and_repo_dir_to_itself(sbox):
   "move wc and repo dir to itself"
   sbox.build(read_only = True)
-  wc_dir = os.path.join(sbox.wc_dir, 'A')
+  wc_dir = sbox.ospath('A')
   repo_url = sbox.repo_url + '/A'
 
   # try to move wc dir to itself
@@ -4986,19 +4986,19 @@ def copy_wc_url_with_absent(sbox):
 
   # A/D excluded
   svntest.main.run_svn(None, 'up', '--set-depth', 'exclude',
-                       os.path.join(sbox.wc_dir, 'A/D'))
+                       sbox.ospath('A/D'))
 
   # Test issue #3314 after copy
   sbox.simple_copy('A', 'A_copied')
-  svntest.main.run_svn(None, 'ci', os.path.join(sbox.wc_dir, 'A_copied'),
+  svntest.main.run_svn(None, 'ci', sbox.ospath('A_copied'),
                        '-m', 'Commit A_copied')
 
   # This tests issue #2763
-  svntest.main.run_svn(None, 'cp', os.path.join(sbox.wc_dir, 'A'),
+  svntest.main.run_svn(None, 'cp', sbox.ospath('A'),
                        '^/A_tagged', '-m', 'Tag A')
 
   # And perform a normal commit
-  svntest.main.run_svn(None, 'ci', os.path.join(sbox.wc_dir, 'A'),
+  svntest.main.run_svn(None, 'ci', sbox.ospath('A'),
                        '-m', 'Commit A')
 
   expected_output = svntest.wc.State(wc_dir, {
@@ -5072,20 +5072,20 @@ def copy_wc_url_with_absent(sbox):
     'D/G/rho'           : Item(status='  ', wc_rev='6'),
   }
 
-  expected_status = svntest.wc.State(os.path.join(wc_dir, 'A_copied'), items)
-  svntest.actions.run_and_verify_status(os.path.join(wc_dir, 'A_copied'),
+  expected_status = svntest.wc.State(sbox.ospath('A_copied'), items)
+  svntest.actions.run_and_verify_status(sbox.ospath('A_copied'),
                                         expected_status)
 
-  expected_status = svntest.wc.State(os.path.join(wc_dir, 'A_tagged'), items)
-  svntest.actions.run_and_verify_status(os.path.join(wc_dir, 'A_tagged'),
+  expected_status = svntest.wc.State(sbox.ospath('A_tagged'), items)
+  svntest.actions.run_and_verify_status(sbox.ospath('A_tagged'),
                                         expected_status)
 
   expected_status.add({
     'no'                : Item(status='  ', wc_rev='6')
   })
 
-  expected_status = svntest.wc.State(os.path.join(wc_dir, 'A'), items)
-  svntest.actions.run_and_verify_status(os.path.join(wc_dir, 'A'),
+  expected_status = svntest.wc.State(sbox.ospath('A'), items)
+  svntest.actions.run_and_verify_status(sbox.ospath('A'),
                                         expected_status)
 
 
@@ -5136,9 +5136,9 @@ def deleted_file_with_case_clash(sbox):
   sbox.build(read_only = True)
   wc_dir = sbox.wc_dir
 
-  iota_path = os.path.join(wc_dir, 'iota')
-  iota2_path = os.path.join(wc_dir, 'iota2')
-  IOTA_path = os.path.join(wc_dir, 'IOTA')
+  iota_path = sbox.ospath('iota')
+  iota2_path = sbox.ospath('iota2')
+  IOTA_path = sbox.ospath('IOTA')
   iota_url = sbox.repo_url + '/iota'
 
   # Perform a case-only rename in two steps.
@@ -5198,10 +5198,10 @@ def case_only_rename(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  iota_path = os.path.join(wc_dir, 'iota')
-  IoTa_path = os.path.join(wc_dir, 'IoTa')
-  B_path = os.path.join(wc_dir, 'A/B')
-  b_path = os.path.join(wc_dir, 'A/b')
+  iota_path = sbox.ospath('iota')
+  IoTa_path = sbox.ospath('IoTa')
+  B_path = sbox.ospath('A/B')
+  b_path = sbox.ospath('A/b')
 
   # Perform a couple of case-only renames.
   svntest.main.run_svn(None, 'move', iota_path, IoTa_path)

Modified: subversion/branches/javahl-ra/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/davautocheck.sh?rev=1343447&r1=1343446&r2=1343447&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/branches/javahl-ra/subversion/tests/cmdline/davautocheck.sh Tue May 29 01:39:41 2012
@@ -90,6 +90,7 @@ export LC_ALL
 
 stop_httpd_and_die() {
   [ -e "$HTTPD_PID" ] && kill $(cat "$HTTPD_PID")
+  echo "HTTPD stopped."
   exit 1
 }
 
@@ -433,6 +434,7 @@ rm "$HTTPD_CFG-copy"
 say "HTTPD is good"
 
 if [ $# -eq 1 ] && [ "x$1" = 'x--no-tests' ]; then
+  echo "http://localhost:$HTTPD_PORT"
   exit
 fi
 



Mime
View raw message