You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/06/26 17:35:21 UTC
svn commit: r1496972 - /subversion/trunk/subversion/tests/cmdline/wc_tests.py
Author: stsp
Date: Wed Jun 26 15:35:21 2013
New Revision: 1496972
URL: http://svn.apache.org/r1496972
Log:
* subversion/tests/cmdline/wc_tests.py
(cleanup_unversioned_items): Verify output from 'svn cleanup' when removing
unversioned items. Add a missing 'svn status' + verification step.
Use single quotes around all strings for consistency.
Modified:
subversion/trunk/subversion/tests/cmdline/wc_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/wc_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/wc_tests.py?rev=1496972&r1=1496971&r2=1496972&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/wc_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/wc_tests.py Wed Jun 26 15:35:21 2013
@@ -258,16 +258,27 @@ def cleanup_unversioned_items(sbox):
svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
[], 'status', '--no-ignore')
- svntest.actions.run_and_verify_svn("Cleanup wc root", None, [],
- "cleanup", "--remove-unversioned")
+ expected_output = [
+ 'D dir1\n',
+ 'D dir2\n',
+ ]
+ svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
+ [], 'cleanup', '--remove-unversioned')
expected_output = [
' M .\n',
'I dir_foo\n',
'I file_foo\n',
]
- svntest.actions.run_and_verify_svn("Cleanup wc root", None, [],
- "cleanup", "--remove-unversioned",
- "--no-ignore")
+ svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
+ [], 'status', '--no-ignore')
+
+ expected_output = [
+ 'D dir_foo\n',
+ 'D file_foo\n',
+ ]
+ svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
+ [], 'cleanup', '--remove-unversioned',
+ '--no-ignore')
expected_output = [
' M .\n',
]