svn commit: r1330949 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py

[da...@apache.org]

Author: danielsh
Date: Thu Apr 26 16:48:40 2012
New Revision: 1330949

URL: http://svn.apache.org/viewvc?rev=1330949&view=rev
Log:
Follow-up to r1330917: enable the check for Windows too.

* subversion/tests/cmdline/svntest/main.py
  (_line_contains_repos_diskpath): New local-scope helper.
  (run_command_stdin): Use os.path.join().

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1330949&r1=1330948&r2=1330949&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Apr 26 16:48:40 2012
@@ -511,14 +511,17 @@ def run_command_stdin(command, error_exp
                                                         stdin_lines,
                                                         *varargs)
 
+  def _line_contains_repos_diskpath(line):
+    return \
+         os.path.join('cmdline', 'svn-test-work', 'repositories') in line \
+      or os.path.join('cmdline', 'svn-test-work', 'local_tmp', 'repos') in line 
+
   for lines, name in [[stdout_lines, "stdout"], [stderr_lines, "stderr"]]:
     if is_ra_type_file() or 'svnadmin' in command:
       break
     # Does the server leak the repository on-disk path?
     # (prop_tests-12 installs a hook script that does that intentionally)
-    if any(map(lambda line: 'cmdline/svn-test-work/repositories' in line \
-                            or 'cmdline/svn-test-work/local_tmp/repos' in line,
-               lines)) \
+    if any(map(_line_contains_repos_diskpath, lines)) \
        and not any(map(lambda arg: 'prop_tests-12' in arg, varargs)):
       raise Failure("Repository diskpath in %s: %r" % (name, lines))