Author: philip
Date: Wed Jan 6 17:36:39 2016
New Revision: 1723390
URL: http://svn.apache.org/viewvc?rev=1723390&view=rev
Log:
* subversion/tests/cmdline/relocate_tests.py
(relocate_with_relative_externals): Followup to r1723387, match the code
style used earlier in the test.
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=1723390&r1=1723389&r2=1723390&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/relocate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/relocate_tests.py Wed Jan 6
17:36:39 2016
@@ -379,22 +379,16 @@ def relocate_with_relative_externals(sbo
svntest.actions.run_and_verify_info([{ 'URL' : '.*.other/A/D/H$' }],
os.path.join(wc_dir, 'A', 'B', 'H-ext'))
+ # Relocate with prefix too long to be valid for externals.
svntest.actions.run_and_verify_svn(None, [], 'relocate',
repo_url + '/A/B',
other_repo_url + '/A/B',
other_wc)
- # Check the URLs of various nodes.
- info_output = {
- wc_dir: '.*.other$',
- os.path.join(wc_dir, 'A', 'B', 'G-ext'): '.*.other/A/D/G$',
- other_wc: '.*.other/A/B$',
- os.path.join(other_wc, 'G-ext'): '.*.other/A/D/G$',
- }
-
- for path, pattern in info_output.items():
- expected_info = { 'URL' : pattern }
- svntest.actions.run_and_verify_info([expected_info], path)
+ svntest.actions.run_and_verify_info([{ 'URL' : '.*.other/A/D/G$' }],
+ os.path.join(other_wc, 'G-ext'))
+ svntest.actions.run_and_verify_info([{ 'URL' : '.*.other/A/D/H$' }],
+ os.path.join(other_wc, 'H-ext'))
########################################################################
# Run the tests