diff options
Diffstat (limited to 'subversion/tests/cmdline/svndumpfilter_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/svndumpfilter_tests.py | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/subversion/tests/cmdline/svndumpfilter_tests.py b/subversion/tests/cmdline/svndumpfilter_tests.py index 93a3244..abd47f6 100755 --- a/subversion/tests/cmdline/svndumpfilter_tests.py +++ b/subversion/tests/cmdline/svndumpfilter_tests.py @@ -34,8 +34,7 @@ import svntest from svntest.verify import SVNExpectedStdout, SVNExpectedStderr # Get some helper routines -from svnadmin_tests import (load_and_verify_dumpstream, load_dumpstream, - test_create) +from svnadmin_tests import load_and_verify_dumpstream, load_dumpstream from svntest.main import run_svn, run_svnadmin # (abbreviation) @@ -60,15 +59,10 @@ def filter_and_return_output(dump, bufsize=0, *varargs): dump = [ dump ] # Does the caller want the stderr? - try: - varargs.index('-q') + if '-q' in varargs or '--quiet' in varargs: expected_errput = None # Stderr with -q or --quiet is a real error! - except: - try: - varargs.index('--quiet') - expected_errput = None - except: - expected_errput = svntest.verify.AnyOutput + else: + expected_errput = svntest.verify.AnyOutput ## TODO: Should we handle exit_code? exit_code, output, errput = svntest.main.run_command_stdin( svntest.main.svndumpfilter_binary, expected_errput, bufsize, True, @@ -92,7 +86,7 @@ def reflect_dropped_renumbered_revs(sbox): ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2982. ## # Test svndumpfilter with include option - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svndumpfilter_tests_data', 'with_merges.dump') @@ -112,13 +106,13 @@ def reflect_dropped_renumbered_revs(sbox): expected_output = svntest.verify.UnorderedOutput([ url + "/trunk - /branch1:4-5\n", ]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) # Test svndumpfilter with exclude option - test_create(sbox) + sbox.build(empty=True) filtered_out, filtered_err = filter_and_return_output( dumpfile, 0, "exclude", "branch1", "--skip-missing-merge-sources", @@ -131,7 +125,7 @@ def reflect_dropped_renumbered_revs(sbox): expected_output = svntest.verify.UnorderedOutput([ url + "/trunk - \n", ]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -142,7 +136,7 @@ def svndumpfilter_loses_mergeinfo(sbox): ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3181. ## - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svndumpfilter_tests_data', 'with_merges.dump') @@ -158,7 +152,7 @@ def svndumpfilter_loses_mergeinfo(sbox): expected_output = svntest.verify.UnorderedOutput([ url + "/trunk - /branch1:4-8\n", ]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -225,7 +219,7 @@ def dumpfilter_with_targets(sbox): "svndumpfilter --targets blah" ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2697. ## - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svndumpfilter_tests_data', @@ -248,7 +242,7 @@ def dumpfilter_with_targets(sbox): def dumpfilter_with_patterns(sbox): "svndumpfilter --pattern PATH_PREFIX" - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svndumpfilter_tests_data', @@ -268,7 +262,7 @@ def dumpfilter_with_patterns(sbox): def filter_mergeinfo_revs_outside_of_dump_stream(sbox): "filter mergeinfo revs outside of dump stream" - test_create(sbox) + sbox.build(empty=True) # Load a partial dump into an existing repository. # @@ -283,7 +277,7 @@ def filter_mergeinfo_revs_outside_of_dump_stream(sbox): # | | | | # trunk---r2---r3-----r5---r6-------r8---r9---------------> | | # r1 | | | | | | - # intial | | | |______ | | + # initial | | | |______ | | # import copy | copy | merge merge # | | | merge (r5) (r8) # | | | (r9) | | @@ -357,7 +351,7 @@ def filter_mergeinfo_revs_outside_of_dump_stream(sbox): url + "/B2 - /trunk:4\n", url + "/B1/B/E - /branches/B2/B/E:6-7\n", "/trunk/B/E:3-4\n"]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -371,7 +365,7 @@ def filter_mergeinfo_revs_outside_of_dump_stream(sbox): # Project-Z (Added r5) # docs/ (Added r6) # README (Added r6). - test_create(sbox) + sbox.build(empty=True) skeleton_dumpfile = open(os.path.join(os.path.dirname(sys.argv[0]), 'svnadmin_tests_data', 'skeleton_repos.dump')).read() @@ -484,7 +478,7 @@ def filter_mergeinfo_revs_outside_of_dump_stream(sbox): expected_output = svntest.verify.UnorderedOutput([ url + "/B1 - /Projects/Project-X/trunk:9\n", url + "/B1/B/E - /Projects/Project-X/trunk/B/E:8-9\n"]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -500,7 +494,7 @@ def filter_mergeinfo_revs_outside_of_dump_stream(sbox): def dropped_but_not_renumbered_empty_revs(sbox): "mergeinfo maps correctly when dropping revs" - test_create(sbox) + sbox.build(empty=True) # The dump file mergeinfo_included_full.dump represents this repository: # @@ -511,7 +505,7 @@ def dropped_but_not_renumbered_empty_revs(sbox): # | | | | # trunk---r2---r3-----r5---r6-------r8---r9---------------> | | # r1 | | | | | | - # intial | | | |______ | | + # initial | | | |______ | | # import copy | copy | merge merge # | | | merge (r5) (r8) # | | | (r9) | | @@ -590,7 +584,7 @@ def dropped_but_not_renumbered_empty_revs(sbox): expected_output = svntest.verify.UnorderedOutput([ url + "/B1 - /trunk:6,8\n", url + "/B1/B/E - /trunk/B/E:5-8\n"]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -616,7 +610,7 @@ def match_empty_prefix(sbox): raise verify.UnexpectedStderr(filtered_err) # Load the filtered dump into a repo and check the result - test_create(sbox) + sbox.build(empty=True) load_dumpstream(sbox, filtered_output, '--ignore-uuid') svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, @@ -650,7 +644,7 @@ def accepts_deltas(sbox): "accepts deltas in the input" # Accept format v3 (as created by 'svnadmin --deltas' or svnrdump). - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svndumpfilter_tests_data', 'simple_v3.dump') @@ -684,7 +678,7 @@ def dumpfilter_targets_expect_leading_slash_prefixes(sbox): "dumpfilter targets expect leading '/' in prefixes" ## See http://subversion.tigris.org/issues/show_bug.cgi?id=4234. ## - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svndumpfilter_tests_data', |