Author: rhuijben
Date: Mon May 9 16:13:24 2011
New Revision: 1101086
URL: http://svn.apache.org/viewvc?rev=1101086&view=rev
Log:
Move two recently added 'basic' tests to their proper location.
* subversion/tests/cmdline/basic_tests.py
(info_multiple_targets): Move to info_tests.py.
(blame_multiple_targets): Move to blame_tests.py
(test_list): Updated.
* subversion/tests/cmdline/blame_tests.py
(blame_multiple_targets): Moved here from basic_tests.py
(test_list): Updated.
* subversion/tests/cmdline/info_tests.py
(info_multiple_targets): Moved here from basic_tests.py
(test_list): Updated.
Modified:
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/blame_tests.py
subversion/trunk/subversion/tests/cmdline/info_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=1101086&r1=1101085&r2=1101086&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Mon May 9
16:13:24 2011
@@ -2816,122 +2816,7 @@ def add_multiple_targets(sbox):
svntest.actions.run_and_verify_svn(None, expected_status, [],
'status', wc_dir)
-def info_multiple_targets(sbox):
- "info multiple targets"
- sbox.build(read_only = True)
- wc_dir = sbox.wc_dir
-
- def multiple_wc_targets():
- "multiple wc targets"
-
- alpha = sbox.ospath('A/B/E/alpha')
- beta = sbox.ospath('A/B/E/beta')
- non_existent_path = os.path.join(wc_dir, 'non-existent')
-
- # All targets are existing
- svntest.actions.run_and_verify_svn2(None, None, [],
- 0, 'info', alpha, beta)
-
- # One non-existing target
- expected_err = ".*W155010.*\n\n.*E200009.*"
- expected_err_re = re.compile(expected_err, re.DOTALL)
-
- exit_code, output, error = svntest.main.run_svn(1, 'info', alpha,
- non_existent_path, beta)
-
- # Verify error
- if not expected_err_re.match("".join(error)):
- raise svntest.Failure('info failed: expected error "%s", but received '
- '"%s"' % (expected_err, "".join(error)))
-
- def multiple_url_targets():
- "multiple url targets"
-
- alpha = sbox.repo_url + '/A/B/E/alpha'
- beta = sbox.repo_url + '/A/B/E/beta'
- non_existent_url = sbox.repo_url + '/non-existent'
-
- # All targets are existing
- svntest.actions.run_and_verify_svn2(None, None, [],
- 0, 'info', alpha, beta)
-
- # One non-existing target
- expected_err = ".*W170000.*\n\n.*E200009.*"
- expected_err_re = re.compile(expected_err, re.DOTALL)
-
- exit_code, output, error = svntest.main.run_svn(1, 'info', alpha,
- non_existent_url, beta)
-
- # Verify error
- if not expected_err_re.match("".join(error)):
- raise svntest.Failure('info failed: expected error "%s", but received '
- '"%s"' % (expected_err, "".join(error)))
- # Test one by one
- multiple_wc_targets()
- multiple_url_targets()
-
-def blame_multiple_targets(sbox):
- "blame multiple target"
-
- sbox.build()
-
- def multiple_wc_targets():
- "multiple wc targets"
-
- # First, make a new revision of iota.
- iota = os.path.join(sbox.wc_dir, 'iota')
- non_existent = os.path.join(sbox.wc_dir, 'non-existent')
- svntest.main.file_append(iota, "New contents for iota\n")
- svntest.main.run_svn(None, 'ci',
- '-m', '', iota)
-
- expected_output = [
- " 1 jrandom This is the file 'iota'.\n",
- " 2 jrandom New contents for iota\n",
- ]
-
- expected_err = ".*W155010.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err, re.DOTALL)
-
- exit_code, output, error = svntest.main.run_svn(1, 'blame',
- non_existent, iota)
-
- # Verify error
- if not expected_err_re.match("".join(error)):
- raise svntest.Failure('blame failed: expected error "%s", but received '
- '"%s"' % (expected_err, "".join(error)))
-
- def multiple_url_targets():
- "multiple url targets"
-
- # First, make a new revision of iota.
- iota = os.path.join(sbox.wc_dir, 'iota')
- iota_url = sbox.repo_url + '/iota'
- non_existent = sbox.repo_url + '/non-existent'
- svntest.main.file_append(iota, "New contents for iota\n")
- svntest.main.run_svn(None, 'ci',
- '-m', '', iota)
-
- expected_output = [
- " 1 jrandom This is the file 'iota'.\n",
- " 2 jrandom New contents for iota\n",
- ]
-
- expected_err = ".*(W160017|W160013).*\n.*E200009.*"
- expected_err_re = re.compile(expected_err, re.DOTALL)
-
- exit_code, output, error = svntest.main.run_svn(1, 'blame',
- non_existent, iota_url)
-
- # Verify error
- if not expected_err_re.match("".join(error)):
- raise svntest.Failure('blame failed: expected error "%s", but received '
- '"%s"' % (expected_err, "".join(error)))
-
- # Test one by one
- multiple_wc_targets()
- multiple_url_targets()
########################################################################
# Run the tests
@@ -2996,8 +2881,6 @@ test_list = [ None,
ls_url_special_characters,
ls_multiple_and_non_existent_targets,
add_multiple_targets,
- info_multiple_targets,
- blame_multiple_targets,
]
if __name__ == '__main__':
Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1101086&r1=1101085&r2=1101086&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Mon May 9
16:13:24 2011
@@ -796,6 +796,68 @@ def merge_sensitive_blame_and_empty_merg
svntest.actions.run_and_verify_svn(None, expected_output, [],
'blame', '-g', psi_COPY_path)
+def blame_multiple_targets(sbox):
+ "blame multiple target"
+
+ sbox.build()
+
+ def multiple_wc_targets():
+ "multiple wc targets"
+
+ # First, make a new revision of iota.
+ iota = os.path.join(sbox.wc_dir, 'iota')
+ non_existent = os.path.join(sbox.wc_dir, 'non-existent')
+ svntest.main.file_append(iota, "New contents for iota\n")
+ svntest.main.run_svn(None, 'ci',
+ '-m', '', iota)
+
+ expected_output = [
+ " 1 jrandom This is the file 'iota'.\n",
+ " 2 jrandom New contents for iota\n",
+ ]
+
+ expected_err = ".*W155010.*\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
+
+ exit_code, output, error = svntest.main.run_svn(1, 'blame',
+ non_existent, iota)
+
+ # Verify error
+ if not expected_err_re.match("".join(error)):
+ raise svntest.Failure('blame failed: expected error "%s", but received '
+ '"%s"' % (expected_err, "".join(error)))
+
+ def multiple_url_targets():
+ "multiple url targets"
+
+ # First, make a new revision of iota.
+ iota = os.path.join(sbox.wc_dir, 'iota')
+ iota_url = sbox.repo_url + '/iota'
+ non_existent = sbox.repo_url + '/non-existent'
+ svntest.main.file_append(iota, "New contents for iota\n")
+ svntest.main.run_svn(None, 'ci',
+ '-m', '', iota)
+
+ expected_output = [
+ " 1 jrandom This is the file 'iota'.\n",
+ " 2 jrandom New contents for iota\n",
+ ]
+
+ expected_err = ".*(W160017|W160013).*\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
+
+ exit_code, output, error = svntest.main.run_svn(1, 'blame',
+ non_existent, iota_url)
+
+ # Verify error
+ if not expected_err_re.match("".join(error)):
+ raise svntest.Failure('blame failed: expected error "%s", but received '
+ '"%s"' % (expected_err, "".join(error)))
+
+ # Test one by one
+ multiple_wc_targets()
+ multiple_url_targets()
+
########################################################################
# Run the tests
@@ -817,6 +879,7 @@ test_list = [ None,
blame_file_not_in_head,
blame_output_after_merge,
merge_sensitive_blame_and_empty_mergeinfo,
+ blame_multiple_targets,
]
if __name__ == '__main__':
Modified: subversion/trunk/subversion/tests/cmdline/info_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/info_tests.py?rev=1101086&r1=1101085&r2=1101086&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Mon May 9 16:13:24
2011
@@ -329,6 +329,60 @@ def info_url_special_characters(sbox):
for url in special_urls:
svntest.actions.run_and_verify_info([expected], url)
+def info_multiple_targets(sbox):
+ "info multiple targets"
+
+ sbox.build(read_only = True)
+ wc_dir = sbox.wc_dir
+
+ def multiple_wc_targets():
+ "multiple wc targets"
+
+ alpha = sbox.ospath('A/B/E/alpha')
+ beta = sbox.ospath('A/B/E/beta')
+ non_existent_path = os.path.join(wc_dir, 'non-existent')
+
+ # All targets are existing
+ svntest.actions.run_and_verify_svn2(None, None, [],
+ 0, 'info', alpha, beta)
+
+ # One non-existing target
+ expected_err = ".*W155010.*\n\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
+
+ exit_code, output, error = svntest.main.run_svn(1, 'info', alpha,
+ non_existent_path, beta)
+
+ # Verify error
+ if not expected_err_re.match("".join(error)):
+ raise svntest.Failure('info failed: expected error "%s", but received '
+ '"%s"' % (expected_err, "".join(error)))
+
+ def multiple_url_targets():
+ "multiple url targets"
+
+ alpha = sbox.repo_url + '/A/B/E/alpha'
+ beta = sbox.repo_url + '/A/B/E/beta'
+ non_existent_url = sbox.repo_url + '/non-existent'
+
+ # All targets are existing
+ svntest.actions.run_and_verify_svn2(None, None, [],
+ 0, 'info', alpha, beta)
+
+ # One non-existing target
+ expected_err = ".*W170000.*\n\n.*E200009.*"
+ expected_err_re = re.compile(expected_err, re.DOTALL)
+
+ exit_code, output, error = svntest.main.run_svn(1, 'info', alpha,
+ non_existent_url, beta)
+
+ # Verify error
+ if not expected_err_re.match("".join(error)):
+ raise svntest.Failure('info failed: expected error "%s", but received '
+ '"%s"' % (expected_err, "".join(error)))
+ # Test one by one
+ multiple_wc_targets()
+ multiple_url_targets()
########################################################################
# Run the tests
@@ -340,6 +394,7 @@ test_list = [ None,
info_on_mkdir,
info_wcroot_abspaths,
info_url_special_characters,
+ info_multiple_targets,
]
if __name__ == '__main__':
