diff options
Diffstat (limited to 'subversion/tests/cmdline/input_validation_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/input_validation_tests.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/subversion/tests/cmdline/input_validation_tests.py b/subversion/tests/cmdline/input_validation_tests.py index a454ac9..e1d74a6 100755 --- a/subversion/tests/cmdline/input_validation_tests.py +++ b/subversion/tests/cmdline/input_validation_tests.py @@ -52,7 +52,7 @@ def run_and_verify_svn_in_wc(sbox, expected_stderr, *varargs): old_dir = os.getcwd() try: os.chdir(wc_dir) - svntest.actions.run_and_verify_svn(None, [], expected_stderr, + svntest.actions.run_and_verify_svn([], expected_stderr, *varargs) finally: os.chdir(old_dir) @@ -266,31 +266,31 @@ def delete_repos_root(sbox): svntest.actions.run_and_verify_switch(sbox.wc_dir, sbox.ospath('A/D/G'), repo_url, None, None, expected_status, - None, None, None, None, None, None, + [], False, '--set-depth', 'empty', '--ignore-ancestry') expected_status.tweak('A/B/F', switched='S') svntest.actions.run_and_verify_switch(sbox.wc_dir, sbox.ospath('A/B/F'), repo_url, None, None, expected_status, - None, None, None, None, None, None, + [], False, '--depth', 'empty', '--ignore-ancestry') # Delete the wcroot (which happens to be the repository root) expected_error = 'svn: E155035: \'.*\' is the root of a working copy ' + \ 'and cannot be deleted' - svntest.actions.run_and_verify_svn('Delete root', [], expected_error, + svntest.actions.run_and_verify_svn([], expected_error, 'rm', wc_dir) # This should produce some error, because we can never commit this expected_error = '.*repository root.*' - svntest.actions.run_and_verify_svn('Move root', None, expected_error, + svntest.actions.run_and_verify_svn(None, expected_error, 'mv', sbox.ospath('A/D/G'), sbox.ospath('Z')) # And this currently fails with another nasty error about a wc-lock expected_error = '.*repository root.*' - svntest.actions.run_and_verify_svn('Delete root', [], expected_error, + svntest.actions.run_and_verify_svn([], expected_error, 'rm', sbox.ospath('A/B/F')) ######################################################################## |