svn commit: r1423861 - in /subversion/trunk/subversion/tests/cmdline: basic_tests.py svntest/main.py

[br...@apache.org]

Author: brane
Date: Wed Dec 19 13:45:11 2012
New Revision: 1423861

URL: http://svn.apache.org/viewvc?rev=1423861&view=rev
Log:
Maybe fix basic_test 48 on Windows.

* subversion/tests/cmdline/basic_tests.py
  (basic_auth_test_xfail_predicate): Never XFAIL on Windows.
* subversion/tests/cmdline/svntest/main.py
  (is_plaintext_password_storage_disabled): Tweak match pattern.

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

Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1423861&r1=1423860&r2=1423861&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Wed Dec 19 13:45:11 2012
@@ -2497,7 +2497,8 @@ def basic_auth_test_xfail_predicate():
   """Predicate for XFail for basic_auth_test:
   The test will fail if plaintext password storage is disabled,
   and the RA method requires authentication."""
-  return (svntest.main.is_ra_type_dav()
+  return (not svntest.main.is_os_windows()
+          and svntest.main.is_ra_type_dav()
           and svntest.main.is_plaintext_password_storage_disabled())
 
 # Issue 2242, auth cache picking up password from wrong username entry

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1423861&r1=1423860&r2=1423861&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Wed Dec 19 13:45:11 2012
@@ -1236,7 +1236,7 @@ def server_has_atomic_revprop():
 
 def is_plaintext_password_storage_disabled():
   try:
-    predicate = re.compile("^[^W]*WARNING: Plaintext password storage is enabled!")
+    predicate = re.compile("^WARNING: Plaintext password storage is enabled!")
     code, out, err = run_svn(False, "--version")
     for line in out:
       if predicate.match(line):