svn commit: r1575291 - in /subversion/trunk/subversion/tests/cmdline: prop_tests.py svntest/sandbox.py

[rh...@apache.org]

Author: rhuijben
Date: Fri Mar  7 15:23:31 2014
New Revision: 1575291

URL: http://svn.apache.org/r1575291
Log:
Following up on r1575284, resolve a minor issue in the sandbox path
construction code.

* subversion/tests/cmdline/prop_tests.py
  (iprops_list_abspath): Update ospath assumption.

* subversion/tests/cmdline/svntest/sandbox.py
  (ospath): Don't produce a path ending with '/' for the '' relpath.

Modified:
    subversion/trunk/subversion/tests/cmdline/prop_tests.py
    subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py

Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1575291&r1=1575290&r2=1575291&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Fri Mar  7 15:23:31 2014
@@ -2719,7 +2719,7 @@ def iprops_list_abspath(sbox):
   sbox.simple_propset('im', 'GammA', 'gamma')
 
   expected_output = [
-    'Inherited properties on \'%s\',\n' % sbox.ospath('')[:-1],
+    'Inherited properties on \'%s\',\n' % sbox.ospath(''),
     'from \'%s\':\n' % sbox.repo_url,
     '  im\n',
     '    root\n',

Modified: subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py?rev=1575291&r1=1575290&r2=1575291&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py Fri Mar  7 15:23:31 2014
@@ -186,7 +186,11 @@ class Sandbox:
        of this sbox, or relative to OS-style path WC_DIR if supplied."""
     if wc_dir is None:
       wc_dir = self.wc_dir
-    return os.path.join(wc_dir, svntest.wc.to_ospath(relpath))
+
+    if relpath == '':
+      return wc_dir
+    else:
+      return os.path.join(wc_dir, svntest.wc.to_ospath(relpath))
 
   def ospaths(self, relpaths, wc_dir=None):
     """Return a list of RELPATHS but with each path converted to an OS-style