diff options
Diffstat (limited to 'subversion/tests/cmdline/svnauthz_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/svnauthz_tests.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/subversion/tests/cmdline/svnauthz_tests.py b/subversion/tests/cmdline/svnauthz_tests.py index fb6318e..c050122 100755 --- a/subversion/tests/cmdline/svnauthz_tests.py +++ b/subversion/tests/cmdline/svnauthz_tests.py @@ -197,9 +197,8 @@ def svnauthz_validate_txn_test(sbox): svntest.main.create_python_hook_script(pre_commit_hook, hook_instance) svntest.main.file_append(authz_path, 'x') expected_status.tweak('A/authz', status=' ', wc_rev=4) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) expected_data = svntest.verify.ExpectedOutput("Exit 2\n", match_all=False) verify_logfile(logfilepath, expected_data) @@ -275,9 +274,8 @@ def svnauthz_accessof_repo_test(sbox): expected_status.add({ 'A/authz' : Item(status=' ', wc_rev=2), }) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) # Anonymous access with no path, and no repository should be rw # since it returns the highest level of access granted anywhere. @@ -967,7 +965,7 @@ def svnauthz_inverted_selector_test(sbox): os.remove(authz_path) -@Issue(4802) +@Issues(4802, 4803) def svnauthz_empty_group_test(sbox): "test empty group definition" @@ -986,12 +984,15 @@ def svnauthz_empty_group_test(sbox): (authz_fd, authz_path) = tempfile.mkstemp() svntest.main.file_write(authz_path, authz_content) + expected_stderr = svntest.verify.RegexOutput( + r".*warning: W220003:.*", match_all=False) + svntest.actions.run_and_verify_svnauthz( - [], None, 0, False, 'validate', authz_path) + [], expected_stderr, 0, False, 'validate', authz_path) svntest.actions.run_and_verify_svnauthz( - 'r', None, 0, False, 'accessof', - '--repository', 'A', '--username', 'user', authz_path) + 'r', expected_stderr, 0, False, 'accessof', + '--repository', 'A', '--username', 'user', authz_path) ######################################################################## |