Author: philip
Date: Tue Aug 3 13:56:58 2010
New Revision: 981885
URL: http://svn.apache.org/viewvc?rev=981885&view=rev
Log:
Make resolved_tests.py 1 pass in single-db.
* subversion/tests/cmdline/switc_tests.py
(resolved_on_wc_root): Tweak expectations for single-db.
Modified:
subversion/trunk/subversion/tests/cmdline/resolved_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/resolved_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/resolved_tests.py?rev=981885&r1=981884&r2=981885&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolved_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolved_tests.py Tue Aug 3
13:56:58 2010
@@ -112,6 +112,8 @@ def resolved_on_wc_root(sbox):
'A/B/lambda',
'A/B/E/alpha', 'A/B/E/beta',
'A/D/gamma')
+ if svntest.main.wc_is_singledb(sbox.wc_dir):
+ expected_disk.remove('A/B/E', 'A/B/F', 'A/B')
expected_status = svntest.actions.get_virginal_state(wc, 2)
expected_status.tweak('iota', 'A/B', 'A/D/gamma',
