Author: pburba
Date: Thu Feb 3 17:47:50 2011
New Revision: 1066894
URL: http://svn.apache.org/viewvc?rev=1066894&view=rev
Log:
Tweak a switch test to avoid a spurious XFail over ra_serf.
* subversion/tests/cmdline/switch_tests.py
(forced_switch_failures): Account for some perfectly valid ra_serf
differences.
(test_list): Remove XFail from forced_switch_failures.
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=1066894&r1=1066893&r2=1066894&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Thu Feb 3
17:47:50 2011
@@ -1350,8 +1350,6 @@ def forced_switch(sbox):
'--force')
#----------------------------------------------------------------------
-# This test currently XFails for serf as the different order of
-# operations is not handled here.
def forced_switch_failures(sbox):
"forced switch detects tree conflicts"
# svntest.factory.make(sbox,
@@ -1559,6 +1557,12 @@ def forced_switch_failures(sbox):
'A/B/F/pi' : Item(status='A '),
})
+ # When running the tests over ra_serf, 'A/D/G/omega' and 'A/D/G/psi' do
+ # manage to get added before the forced switch above errors out. So don't
+ # expect those two paths to appear in the output of the final update.
+ if svntest.main.is_ra_type_dav_serf():
+ expected_output.remove('A/D/G/omega', 'A/D/G/psi')
+
expected_disk.remove('A/D/G/tau', 'A/D/G/rho', 'A/D/G/pi')
expected_disk.add({
'A/D/H/I' : Item(),
@@ -3153,8 +3157,7 @@ test_list = [ None,
switch_change_repos_root,
relocate_and_propset,
forced_switch,
- XFail(forced_switch_failures,
- svntest.main.is_ra_type_dav_serf),
+ forced_switch_failures,
switch_scheduled_add,
SkipUnless(mergeinfo_switch_elision, server_has_mergeinfo),
switch_with_obstructing_local_adds,
