Author: philip
Date: Thu Sep 22 13:10:38 2011
New Revision: 1174111
URL: http://svn.apache.org/viewvc?rev=1174111&view=rev
Log:
Avoid occasional test failures caused by copying a BDB repository incorrectly.
* subversion/tests/cmdline/externals_tests.py
(file_externals_different_repos): Use repository copy function.
* subversion/tests/cmdline/basic_tests.py
(basic_relocate): Use repository copy function.
Modified:
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/externals_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1174111&r1=1174110&r2=1174111&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Thu Sep 22
13:10:38 2011
@@ -2623,7 +2623,7 @@ def basic_relocate(sbox):
repo_dir = sbox.repo_dir
repo_url = sbox.repo_url
other_repo_dir, other_repo_url = sbox.add_repo_path('other')
- shutil.copytree(repo_dir, other_repo_dir)
+ svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 0)
def _verify_url(wc_path, url):
name = os.path.basename(wc_path)
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1174111&r1=1174110&r2=1174111&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Sep 22
13:10:38 2011
@@ -1886,7 +1886,7 @@ def file_externals_different_repos(sbox)
r1_url = sbox.repo_url
r2_dir, r2_url = sbox.add_repo_path('2')
- shutil.copytree(sbox.repo_dir, r2_dir)
+ svntest.main.copy_repos(sbox.repo_dir, r2_dir, 1, 0)
sbox.simple_propset('svn:externals',
