You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/08/06 13:11:00 UTC
svn commit: r982931 -
/subversion/trunk/subversion/tests/cmdline/switch_tests.py
Author: philip
Date: Fri Aug 6 11:11:00 2010
New Revision: 982931
URL: http://svn.apache.org/viewvc?rev=982931&view=rev
Log:
Make switch_tests.py 31 and 32 pass in single-db. Deleted directories
are removed from disk in single-db, but remain until commit in
per-directory-db.
* subversion/tests/cmdline/switch_tests.py
(tree_conflicts_on_switch_1_1,
tree_conflicts_on_switch_1_2): Tweak expectations for single-db.
Modified:
subversion/trunk/subversion/tests/cmdline/switch_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=982931&r1=982930&r2=982931&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Aug 6 11:11:00 2010
@@ -2493,6 +2493,10 @@ def tree_conflicts_on_switch_1_1(sbox):
})
expected_disk = disk_empty_dirs.copy()
+ if svntest.main.wc_is_singledb(sbox.wc_dir):
+ expected_disk.remove('D/D1', 'DF/D1', 'DD/D1', 'DD/D1/D2',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2', 'DDD/D1/D2/D3')
# The files delta, epsilon, and zeta are incoming additions, but since
# they are all within locally deleted trees they should also be schedule
@@ -2599,6 +2603,10 @@ def tree_conflicts_on_switch_1_2(sbox):
expected_disk.remove('D/D1',
'DD/D1/D2',
'DDD/D1/D2/D3')
+ if svntest.main.wc_is_singledb(sbox.wc_dir):
+ expected_disk.remove('DF/D1', 'DD/D1',
+ 'DDF/D1', 'DDF/D1/D2',
+ 'DDD/D1', 'DDD/D1/D2')
expected_info = {
'F/alpha' : {
RE: svn commit: r982931 - /subversion/trunk/subversion/tests/cmdline/switch_tests.py
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: philip@apache.org [mailto:philip@apache.org]
> Sent: vrijdag 6 augustus 2010 13:11
> To: commits@subversion.apache.org
> Subject: svn commit: r982931 -
> /subversion/trunk/subversion/tests/cmdline/switch_tests.py
>
> Author: philip
> Date: Fri Aug 6 11:11:00 2010
> New Revision: 982931
>
> URL: http://svn.apache.org/viewvc?rev=982931&view=rev
> Log:
> Make switch_tests.py 31 and 32 pass in single-db. Deleted directories
> are removed from disk in single-db, but remain until commit in
> per-directory-db.
>
> * subversion/tests/cmdline/switch_tests.py
> (tree_conflicts_on_switch_1_1,
> tree_conflicts_on_switch_1_2): Tweak expectations for single-db.
For some reason this patch makes these tests fail for !single-db.
Bert