Author: rhuijben
Date: Thu Feb 26 01:12:37 2015
New Revision: 1662343
URL: http://svn.apache.org/r1662343
Log:
* subversion/tests/cmdline/revert_tests.py
(revert_obstructing_wc): Run status, but no entries comparison.
* subversion/tests/cmdline/svntest/actions.py
(run_and_verify_status): After removing 4 optional arguments in r1662327,
add one new one to explicitly disable the entries comparison.
Modified:
subversion/trunk/subversion/tests/cmdline/revert_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1662343&r1=1662342&r2=1662343&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Thu Feb 26
01:12:37 2015
@@ -1626,12 +1626,6 @@ def revert_obstructing_wc(sbox):
# A is not versioned but exists
})
- # The entries tree currently doesn't return the expected data. It just
- # walks into the obstructing WC.
- #
- # Properly fixing this by converting the entries read code to wcroot, relpath
- # (to allow the old api to see the stubs again) takes more work than I can do
- # in one evening, so disable status check for now. (BH 2014-02)
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None,
None,
@@ -1639,6 +1633,12 @@ def revert_obstructing_wc(sbox):
None, None, None,
wc_dir, '--set-depth', 'infinity')
+ # The entries tree currently doesn't return the expected data. It just
+ # walks into the obstructing WC, while it should just construct the right
+ # parent stub from the parent dir
+ svntest.actions.run_and_verify_status(wc_dir, expected_status,
+ no_entries=True)
+
# Revert should do nothing (no local changes), and report the obstruction
# (reporting the obstruction is nice for debugging, but not really required
# in this specific case, as the node was not modified)
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1662343&r1=1662342&r2=1662343&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Thu Feb 26
01:12:37 2015
@@ -1510,7 +1510,7 @@ def run_and_verify_commit(wc_dir_name, o
# This function always passes '-q' to the status command, which
# suppresses the printing of any unversioned or nonexistent items.
-def run_and_verify_status(wc_dir_name, status_tree):
+def run_and_verify_status(wc_dir_name, status_tree, no_entries=False):
"""Run 'status' on WC_DIR_NAME and compare it with the
expected STATUS_TREE.
Returns on success, raises on failure."""
@@ -1531,6 +1531,9 @@ def run_and_verify_status(wc_dir_name, s
wc_dir_name)
raise
+ if no_entries:
+ return
+
# if we have an output State, and we can/are-allowed to create an
# entries-based State, then compare the two.
actual_entries = wc.State.from_entries(wc_dir_name)
