Author: rhuijben
Date: Mon Feb 23 00:41:05 2015
New Revision: 1661590
URL: http://svn.apache.org/r1661590
Log:
Following up on r1661357, extend testcase to process output of commit.
* subversion/tests/cmdline/copy_tests.py
(mixed_wc_to_url): Extend test.
Modified:
subversion/trunk/subversion/tests/cmdline/copy_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1661590&r1=1661589&r2=1661590&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Feb 23 00:41:05
2015
@@ -1761,7 +1761,34 @@ def mixed_wc_to_url(sbox):
'mkdir', Y_path)
# Now copy local A/D/G to create new directory A/D/Z the repository.
- svntest.actions.run_and_verify_svn(None, [],
+
+ expected_status = svntest.wc.State(G_path, {
+ '' : Item(status=' ', wc_rev='1'),
+ 'X' : Item(status='A ', copied='+', wc_rev='-'),
+ 'X/F' : Item(status=' ', copied='+', wc_rev='-'),
+ 'X/E' : Item(status=' ', copied='+', wc_rev='-'),
+ 'X/E/alpha' : Item(status='D ', copied='+', wc_rev='-'),
+ 'X/E/beta' : Item(status=' ', copied='+', wc_rev='-'),
+ 'X/lambda' : Item(status=' ', copied='+', wc_rev='-'),
+ 'Y' : Item(status='A ', wc_rev='-'),
+ 'rho' : Item(status='M ', wc_rev='3'),
+ 'tau' : Item(status=' ', wc_rev='1'),
+ })
+
+ svntest.actions.run_and_verify_status(G_path, expected_status)
+
+ expected_output = svntest.verify.UnorderedOutput([
+ 'Adding copy of %s\n' % sbox.ospath('A/D/G'),
+ 'Adding copy of %s\n' % sbox.ospath('A/D/G/X'),
+ 'Deleting copy of %s\n' % sbox.ospath('A/D/G/X/E/alpha'),
+ 'Adding copy of %s\n' % sbox.ospath('A/D/G/Y'),
+ 'Deleting copy of %s\n' % sbox.ospath('A/D/G/pi'),
+ 'Replacing copy of %s\n' % sbox.ospath('A/D/G/rho'),
+ 'Transmitting file data .done\n',
+ 'Committing transaction...\n',
+ 'Committed revision 4.\n',
+ ])
+ svntest.actions.run_and_verify_svn(expected_output, [],
'cp', '-m', "Make a copy.",
G_path, Z_url)
expected_output = svntest.verify.UnorderedOutput([
