Author: philip
Date: Wed Nov 17 14:40:24 2010
New Revision: 1036067
URL: http://svn.apache.org/viewvc?rev=1036067&view=rev
Log:
One of perils of writing an XFAIL test: it may fail for the wrong reason.
* subversion/tests/cmdline/upgrade_tests.py
(delete_in_copy_upgrade): Don't pass non-existant variable, tweak
expected_status.
* subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2: Replace
with tarball where A/B is not deleted.
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1036067&r1=1036066&r2=1036067&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Nov 17
14:40:24 2010
@@ -698,17 +698,17 @@ def delete_in_copy_upgrade(sbox):
replace_sbox_with_tarfile(sbox, 'delete-in-copy.tar.bz2')
# Doesn't work, creates spurious base nodes for the copy
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'upgrade', sbox.wc_dir)
expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
expected_status.add({
- 'A/B-copied' : Item(status='A ', copied='+', wc_rev='-'),
- 'A/B-copied/lambda' : Item(status=' ', copied='+', wc_rev='-'),
- 'A/B-copied/E' : Item(status='D ', wc_rev='-'),
- 'A/B-copied/E/alpha' : Item(status='D ', wc_rev='-'),
- 'A/B-copied/E/beta' : Item(status='D ', wc_rev='-'),
- 'A/B-copied/F' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/B-copied' : Item(status='A ', copied='+', wc_rev='-'),
+ 'A/B-copied/lambda' : Item(status=' ', copied='+', wc_rev='-'),
+ 'A/B-copied/E' : Item(status='D ', wc_rev='?'),
+ 'A/B-copied/E/alpha' : Item(status='D ', wc_rev='?'),
+ 'A/B-copied/E/beta' : Item(status='D ', wc_rev='?'),
+ 'A/B-copied/F' : Item(status=' ', copied='+', wc_rev='-'),
})
run_and_verify_status_no_server(sbox.wc_dir, expected_status)
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2?rev=1036067&r1=1036066&r2=1036067&view=diff
==============================================================================
Binary files - no diff available.
