subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1701603 - /subversion/trunk/subversion/tests/cmdline/lock_tests.py
Date Mon, 07 Sep 2015 10:42:32 GMT
Author: rhuijben
Date: Mon Sep  7 10:42:32 2015
New Revision: 1701603

URL: http://svn.apache.org/r1701603
Log:
Following up on r1701598, revert guessed behavior change on posix platforms
in two tests.

* subversion/tests/cmdline/lock_tests.py
  (lock_and_exebit1,
   lock_and_exebit2): Revert change, as this change doesn't affect propset.

Modified:
    subversion/trunk/subversion/tests/cmdline/lock_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1701603&r1=1701602&r2=1701603&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Mon Sep  7 10:42:32 2015
@@ -945,12 +945,12 @@ def lock_and_exebit1(sbox):
   gamma_path = sbox.ospath('A/D/gamma')
 
   expected_err = ".*svn: warning: W125005: To turn off the svn:needs-lock property,.*"
-  svntest.actions.run_and_verify_svn(None, expected_err,
-                                     'ps', 'svn:needs-lock', ' ', gamma_path)
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
+                                      'ps', 'svn:needs-lock', ' ', gamma_path)
 
   expected_err = ".*svn: warning: W125005: To turn off the svn:executable property,.*"
-  svntest.actions.run_and_verify_svn(None, expected_err,
-                                     'ps', 'svn:executable', ' ', gamma_path)
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
+                                      'ps', 'svn:executable', ' ', gamma_path)
 
   # commit
   svntest.actions.run_and_verify_svn(None, [], 'commit',
@@ -1022,11 +1022,11 @@ def lock_and_exebit2(sbox):
   gamma_path = sbox.ospath('A/D/gamma')
 
   expected_err = ".*svn: warning: W125005: To turn off the svn:needs-lock property,.*"
-  svntest.actions.run_and_verify_svn(None, expected_err,
-                                     'ps', 'svn:needs-lock', ' ', gamma_path)
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
+                                      'ps', 'svn:needs-lock', ' ', gamma_path)
 
   expected_err = ".*svn: warning: W125005: To turn off the svn:executable property,.*"
-  svntest.actions.run_and_verify_svn(None, expected_err,
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
                                      'ps', 'svn:executable', ' ', gamma_path)
 
   # commit



Mime
View raw message