Author: julianfoad
Date: Fri Feb 6 11:06:45 2015
New Revision: 1657780
URL: http://svn.apache.org/r1657780
Log:
Following r1657777, unbreak other tests that imported a function I deleted.
* subversion/tests/cmdline/svndumpfilter_tests.py
(): Don't try to import 'test_create' from svnadmin_tests.py because it's
gone.
(reflect_dropped_renumbered_revs,
svndumpfilter_loses_mergeinfo,
dumpfilter_with_targets,
dumpfilter_with_patterns,
match_empty_prefix,
accepts_deltas): Use sbox.build() instead of test_create().
* subversion/tests/cmdline/svnrdump_tests.py
(): Don't try to import 'test_create' from svnadmin_tests.py because it's
gone.
(dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads): Use
sbox.build() instead of test_create().
Modified:
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py?rev=1657780&r1=1657779&r2=1657780&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py Fri Feb 6
11:06:45 2015
@@ -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)
@@ -87,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')
@@ -113,7 +112,7 @@ def reflect_dropped_renumbered_revs(sbox
# 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",
@@ -137,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')
@@ -220,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',
@@ -243,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',
@@ -263,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.
#
@@ -366,7 +365,7 @@ def filter_mergeinfo_revs_outside_of_dum
# 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()
@@ -495,7 +494,7 @@ def filter_mergeinfo_revs_outside_of_dum
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:
#
@@ -611,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,
@@ -645,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')
@@ -679,7 +678,7 @@ def dumpfilter_targets_expect_leading_sl
"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',
Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1657780&r1=1657779&r2=1657780&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Fri Feb 6
11:06:45 2015
@@ -34,7 +34,6 @@ from svntest.verify import SVNUnexpected
from svntest.verify import SVNExpectedStderr
from svntest.main import write_restrictive_svnserve_conf
from svntest.main import server_has_partial_replay
-from svnadmin_tests import test_create
# (abbreviation)
Skip = svntest.testcase.Skip_deco
@@ -466,7 +465,7 @@ def dont_drop_valid_mergeinfo_during_inc
"don't drop mergeinfo revs in incremental svnrdump"
# Create an empty repos.
- test_create(sbox)
+ sbox.build(empty=True)
# Create the revprop-change hook for this test
svntest.actions.enable_revprop_changes(sbox.repo_dir)
@@ -572,7 +571,7 @@ def dont_drop_valid_mergeinfo_during_inc
dump_fp.close()
# Blow away the current repos and create an empty one in its place.
- test_create(sbox)
+ sbox.build(empty=True)
# Create the revprop-change hook for this test
svntest.actions.enable_revprop_changes(sbox.repo_dir)
@@ -607,7 +606,7 @@ def dont_drop_valid_mergeinfo_during_inc
# PART 3: Load a full dump to an non-empty repository.
#
# Reset our sandbox.
- test_create(sbox)
+ sbox.build(empty=True)
# Create the revprop-change hook for this test
svntest.actions.enable_revprop_changes(sbox.repo_dir)
@@ -668,7 +667,7 @@ def dont_drop_valid_mergeinfo_during_inc
# PART 4: Load a a series of incremental dumps to an non-empty repository.
#
# Reset our sandbox.
- test_create(sbox)
+ sbox.build(empty=True)
# Create the revprop-change hook for this test
svntest.actions.enable_revprop_changes(sbox.repo_dir)
