Author: brane
Date: Mon Aug 25 08:49:04 2014
New Revision: 1620274
URL: http://svn.apache.org/r1620274
Log:
Fix some tests that assume they can use global resource and then
fail miserably in parallel-test mode.
* subversion/tests/cmdline/relocate_tests.py
(relocate_and_propset, single_file_relocate):
Don't touch svntest.main.greek_dump_dir; it's a global directory and
fiddling with it may lead to races and spurious test failures
in parallel mode.
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=1620274&r1=1620273&r2=1620274&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/relocate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/relocate_tests.py Mon Aug 25
08:49:04 2014
@@ -212,12 +212,13 @@ def relocate_and_propset(sbox):
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(svntest.main.greek_dump_dir)
+ 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.',
- svntest.main.greek_dump_dir, sbox.repo_url)
+ greek_dump_dir, sbox.repo_url)
# checkout
svntest.main.safe_rmtree(wc_dir, 1)
@@ -280,12 +281,13 @@ def single_file_relocate(sbox):
repo_dir = sbox.repo_dir
repo_url = sbox.repo_url
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(svntest.main.greek_dump_dir)
+ 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.',
- svntest.main.greek_dump_dir, sbox.repo_url)
+ greek_dump_dir, sbox.repo_url)
# checkout
svntest.main.safe_rmtree(wc_dir, 1)
