diff options
Diffstat (limited to 'subversion/tests/cmdline/schedule_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/schedule_tests.py | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/subversion/tests/cmdline/schedule_tests.py b/subversion/tests/cmdline/schedule_tests.py index d27fbf7..6000588 100755 --- a/subversion/tests/cmdline/schedule_tests.py +++ b/subversion/tests/cmdline/schedule_tests.py @@ -184,15 +184,17 @@ def add_executable(sbox): file_ospath = sbox.ospath(fileName) if executable: expected_out = ["*\n"] + expected_err = [] else: expected_out = [] + expected_err = '.*W200017: Property.*not found' # create an empty file open(file_ospath, "w") os.chmod(file_ospath, perm) sbox.simple_add(fileName) - svntest.actions.run_and_verify_svn(None, expected_out, [], + svntest.actions.run_and_verify_svn(expected_out, expected_err, 'propget', "svn:executable", file_ospath) test_cases = [ @@ -276,7 +278,7 @@ def revert_add_files(sbox): epsilon_path = sbox.ospath('A/D/G/epsilon') files = [delta_path, zeta_path, epsilon_path] - exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [], + exit_code, output, err = svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive', wc_dir) @@ -296,7 +298,7 @@ def revert_add_directories(sbox): Z_path = sbox.ospath('A/D/H/Z') files = [X_path, Y_path, Z_path] - exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [], + exit_code, output, err = svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive', wc_dir) @@ -322,7 +324,7 @@ def revert_nested_adds(sbox): + [os.path.join(Z_path, child) for child in ['R', 'zeta']]) - exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [], + exit_code, output, err = svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive', wc_dir) @@ -343,7 +345,7 @@ def revert_add_executable(sbox): other_path = sbox.ospath('other_exe') files = [all_path, none_path, user_path, group_path, other_path] - exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [], + exit_code, output, err = svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive', wc_dir) @@ -364,7 +366,7 @@ def revert_delete_files(sbox): omega_path = sbox.ospath('A/D/H/omega') files = [iota_path, mu_path, omega_path, rho_path] - exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [], + exit_code, output, err = svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive', wc_dir) @@ -390,7 +392,7 @@ def revert_delete_dirs(sbox): files = [E_path, F_path, H_path, alpha_path, beta_path, chi_path, omega_path, psi_path] - exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [], + exit_code, output, err = svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive', wc_dir) @@ -493,8 +495,7 @@ def delete_missing(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) #---------------------------------------------------------------------- # Regression test for issue #854: @@ -553,7 +554,7 @@ def status_add_deleted_directory(sbox): # Update will *not* remove the entry for A despite it being marked # deleted. - svntest.actions.run_and_verify_svn(None, exp_noop_up_out(2), [], + svntest.actions.run_and_verify_svn(exp_noop_up_out(2), [], 'up', wc_dir) expected_status.tweak('', 'iota', wc_rev=2) svntest.actions.run_and_verify_status(wc_dir, expected_status) @@ -567,10 +568,9 @@ def status_add_deleted_directory(sbox): def add_recursive_already_versioned(sbox): "'svn add' should traverse already-versioned dirs" + sbox.build() wc_dir = sbox.wc_dir - svntest.actions.make_repo_and_wc(sbox) - # Create some files, then schedule them for addition delta_path = sbox.ospath('delta') zeta_path = sbox.ospath('A/B/zeta') @@ -616,8 +616,7 @@ def fail_add_directory(sbox): os.makedirs(sbox.wc_dir) os.chdir(sbox.wc_dir) - svntest.actions.run_and_verify_svn('Failed mkdir', - None, svntest.verify.AnyOutput, + svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, 'mkdir', 'A') if os.path.exists('A'): raise svntest.Failure('svn mkdir created an unversioned directory') @@ -636,7 +635,7 @@ def delete_non_existent(sbox): wc_dir = sbox.wc_dir os.chdir(wc_dir) - svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput, + svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, 'rm', '--force', 'non-existent') @@ -651,7 +650,7 @@ def delete_redelete_fudgery(sbox): B_path = os.path.join(wc_dir, 'A', 'B') # Delete 'A/B' using --keep-local, then remove at the OS level. - svntest.actions.run_and_verify_svn(None, None, [], + svntest.actions.run_and_verify_svn(None, [], 'rm', '--keep-local', B_path) svntest.main.safe_rmtree(B_path) @@ -669,10 +668,10 @@ def delete_redelete_fudgery(sbox): ### information stored now in the working copy root's one DB. That ### could change the whole flow of this test, possible leading us to ### remove it as altogether irrelevant. --cmpilato - svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir) + svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir) # Now try to run - svntest.actions.run_and_verify_svn(None, None, [], + svntest.actions.run_and_verify_svn(None, [], 'rm', '--keep-local', B_path) def propset_on_deleted_should_fail(sbox): @@ -681,9 +680,9 @@ def propset_on_deleted_should_fail(sbox): wc_dir = sbox.wc_dir iota = os.path.join(wc_dir, 'iota') - svntest.actions.run_and_verify_svn(None, None, [], 'rm', iota) + svntest.actions.run_and_verify_svn(None, [], 'rm', iota) - svntest.actions.run_and_verify_svn(None, None, "svn: E155023: Can't set propert.*", + svntest.actions.run_and_verify_svn(None, "svn: E155023: Can't set propert.*", 'ps', 'prop', 'val', iota) @Issue(3468) @@ -721,8 +720,7 @@ def replace_dir_delete_child(sbox): svntest.actions.run_and_verify_commit(sbox.wc_dir, expected_output, - expected_status, - None, sbox.wc_dir) + expected_status) ######################################################################## |