Author: philip
Date: Tue Aug 3 14:56:08 2010
New Revision: 981905
URL: http://svn.apache.org/viewvc?rev=981905&view=rev
Log:
Make depth_tests.py 37-40 pass in single-db.
* subversion/tests/cmdline/switc_tests.py
(make_depth_tree_conflicts): Tweak expectations for single-db.
Modified:
subversion/trunk/subversion/tests/cmdline/depth_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=981905&r1=981904&r2=981905&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Tue Aug 3
14:56:08 2010
@@ -2442,6 +2442,8 @@ def make_depth_tree_conflicts(sbox):
expected_disk.remove('A/mu',
'A/B', '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')
# This test is set XFail because this (correct) status cannot be
# verified due to an "svn update" bug. The tree-conflict on A/B
