Author: danielsh
Date: Tue Jul 27 18:31:43 2010
New Revision: 979797
URL: http://svn.apache.org/viewvc?rev=979797&view=rev
Log:
On the 'atomic-revprop' branch:
* subversion/tests/cmdline/prop_tests.py
(atomic_over_ra): Add whitespace and comments for readability.
Modified:
subversion/branches/atomic-revprop/subversion/tests/cmdline/prop_tests.py
Modified:
subversion/branches/atomic-revprop/subversion/tests/cmdline/prop_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/prop_tests.py?rev=979797&r1=979796&r2=979797&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/prop_tests.py
(original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/prop_tests.py
Tue Jul 27 18:31:43 2010
@@ -1977,11 +1977,13 @@ def atomic_over_ra(sbox):
'propset', '--revprop', '-r', '0',
'flower', 'violet', repo_url)
+ # Helpers.
def FAILS_WITH_BPV(not_the_old_value, proposed_value):
expected_stderr = ".*revprop 'flower' has unexpected value.*"
svntest.actions.run_and_verify_atomic_ra_revprop_change(
None, None, expected_stderr, 1, repo_url, 0, 'flower',
not_the_old_value, proposed_value)
+
def PASSES_WITHOUT_BPV(yes_the_old_value, proposed_value):
svntest.actions.run_and_verify_atomic_ra_revprop_change(
None, None, [], 0, repo_url, 0, 'flower',
@@ -1990,12 +1992,15 @@ def atomic_over_ra(sbox):
# Value of "flower" is 's1'.
FAILS_WITH_BPV(s2, s1)
PASSES_WITHOUT_BPV(s1, s2)
+
# Value of "flower" is 's2'.
FAILS_WITH_BPV(s1, None)
PASSES_WITHOUT_BPV(s2, None)
+
# Value of "flower" is <not set>.
FAILS_WITH_BPV(s2, s1)
PASSES_WITHOUT_BPV(None, s1)
+
# Value of "flower" is 's1'.
svntest.actions.check_prop('flower', repo_url, [s1], 0)
