Author: cmpilato
Date: Fri Oct 22 19:39:55 2010
New Revision: 1026461
URL: http://svn.apache.org/viewvc?rev=1026461&view=rev
Log:
Rename (and relocate) a recently added regression test.
* subversion/tests/cmdline/switch_tests.py
(relocate_URL_prefix): Move to basic_tests.py:basic_relocate().
(test_list): Remove reference to relocate_URL_prefix() tests.
* subversion/tests/cmdline/basic_tests.py
(basic_relocate): Was switch_tests.py:relocate_URL_prefix().
(test_list): Add reference to basic_relocate() tests.
Modified:
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/switch_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=1026461&r1=1026460&r2=1026461&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Oct 22
19:39:55 2010
@@ -2592,6 +2592,23 @@ def delete_child_parent_update(sbox):
#----------------------------------------------------------------------
+def basic_relocate(sbox):
+ "basic relocate of a wc"
+ sbox.build(read_only = True)
+ repo_url = sbox.repo_url
+ wc_dir = sbox.wc_dir
+
+ # Try some no-op relocations using URL prefixes.
+ scheme = repo_url[:repo_url.index('://')+3]
+ svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
+ scheme, scheme, wc_dir)
+ scheme = repo_url[0 : 14]
+ svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
+ scheme, scheme, wc_dir)
+
+ ### Someday, try this with argv[1] != argv[2].
+
+
########################################################################
# Run the tests
@@ -2651,6 +2668,7 @@ test_list = [ None,
svntest.main.is_ra_type_dav),
delete_and_add_same_file,
delete_child_parent_update,
+ basic_relocate,
]
if __name__ == '__main__':
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1026461&r1=1026460&r2=1026461&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Oct 22
19:39:55 2010
@@ -3123,22 +3123,6 @@ def relocate_with_relative_externals(sbo
svntest.actions.run_and_verify_info([{ 'URL' : '.*.other/A/D/G$' }],
os.path.join(wc_dir, 'A', 'B', 'G-ext'))
-# Regression test for a functionality we all like
-def relocate_URL_prefix(sbox):
- "relocate with URL prefixes"
- sbox.build(read_only = True)
- repo_url = sbox.repo_url
- wc_dir = sbox.wc_dir
-
- ### Someday, try this with argv[1] != argv[2].
- scheme = repo_url[0 : repo_url.index('://')+3]
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
- scheme, scheme, wc_dir)
- scheme = repo_url[0 : 14]
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
- scheme, scheme, wc_dir)
-
-
########################################################################
# Run the tests
@@ -3185,7 +3169,6 @@ test_list = [ None,
relocate_with_switched_children,
XFail(copy_with_switched_subdir),
XFail(relocate_with_relative_externals),
- relocate_URL_prefix,
]
if __name__ == '__main__':
