Author: brane
Date: Mon Aug 25 12:37:36 2014
New Revision: 1620311
URL: http://svn.apache.org/r1620311
Log:
Follow-up to r1620274: stop reinventing the wheel.
* subversion/tests/cmdline/relocate_tests.py
(relocate_and_propset, single_file_relocate): Use the existing action
tool to create the initial (untracked) greek repository instead of
copying (part of) the implementation.
Modified:
subversion/trunk/subversion/tests/cmdline/relocate_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/relocate_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/relocate_tests.py?rev=1620311&r1=1620310&r2=1620311&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/relocate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/relocate_tests.py Mon Aug 25
12:37:36 2014
@@ -208,17 +208,12 @@ def relocate_and_propset(sbox):
# Create virgin repos and working copy
svntest.main.safe_rmtree(sbox.repo_dir, 1)
svntest.main.create_repos(sbox.repo_dir)
+ svntest.actions.guarantee_greek_repository(
+ sbox.repo_dir, svntest.main.options.server_minor_version)
wc_dir = sbox.wc_dir
repo_dir = sbox.repo_dir
repo_url = sbox.repo_url
- greek_dump_dir = sbox.add_wc_path('greek-dump')
-
- # import the greek tree
- svntest.main.greek_state.write_to_disk(greek_dump_dir)
- exit_code, output, errput = svntest.main.run_svn(
- None, 'import', '-m', 'Log message for revision 1.',
- greek_dump_dir, sbox.repo_url)
# checkout
svntest.main.safe_rmtree(wc_dir, 1)
@@ -274,7 +269,8 @@ def single_file_relocate(sbox):
# Create virgin repos and working copy
svntest.main.safe_rmtree(sbox.repo_dir, 1)
- svntest.main.create_repos(sbox.repo_dir)
+ svntest.actions.guarantee_greek_repository(
+ sbox.repo_dir, svntest.main.options.server_minor_version)
wc_dir = sbox.wc_dir
iota_path = os.path.join(sbox.wc_dir, 'iota')
@@ -283,12 +279,6 @@ def single_file_relocate(sbox):
iota_url = repo_url + '/iota'
greek_dump_dir = sbox.add_wc_path('greek-dump')
- # import the greek tree
- svntest.main.greek_state.write_to_disk(greek_dump_dir)
- exit_code, output, errput = svntest.main.run_svn(
- None, 'import', '-m', 'Log message for revision 1.',
- greek_dump_dir, sbox.repo_url)
-
# checkout
svntest.main.safe_rmtree(wc_dir, 1)
svntest.actions.run_and_verify_svn(None,
