You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/07/07 19:12:12 UTC
svn commit: r1143926 - in /subversion/trunk/subversion/tests/cmdline:
info_tests.py svntest/actions.py tree_conflict_tests.py
Author: danielsh
Date: Thu Jul 7 17:12:12 2011
New Revision: 1143926
URL: http://svn.apache.org/viewvc?rev=1143926&view=rev
Log:
Tighten up the run_and_verify_info() interface.
* subversion/tests/cmdline/svntest/actions.py
(run_and_verify_info): Use re.match(), not re.search(), thereby
requiring a match at the start of the string rather than anywhere.
* subversion/tests/cmdline/info_tests.py
(info_show_exclude): Adjust callers, fixing one caller.
* subversion/tests/cmdline/tree_conflict_tests.py
(ensure_tree_conflict): Adjust caller.
Modified:
subversion/trunk/subversion/tests/cmdline/info_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/info_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/info_tests.py?rev=1143926&r1=1143925&r2=1143926&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Thu Jul 7 17:12:12 2011
@@ -424,9 +424,8 @@ def info_show_exclude(sbox):
svntest.main.run_svn(None, 'up', '--set-depth', 'exclude', A_path)
wc_uuid = svntest.actions.get_wc_uuid(wc_dir)
- expected_info = []
expected_info = [{
- 'Path' : '.',
+ 'Path' : re.escape(wc_dir),
'Repository Root' : sbox.repo_url,
'Repository UUID' : wc_uuid,
}]
@@ -435,7 +434,7 @@ def info_show_exclude(sbox):
wc_dir)
expected_info = [{
- 'Path' : 'A',
+ 'Path' : '.*%sA' % re.escape(os.sep),
'Repository Root' : sbox.repo_url,
'Repository UUID' : wc_uuid,
'Depth' : 'exclude',
@@ -449,7 +448,7 @@ def info_show_exclude(sbox):
'immediates', A_path)
expected_info = [{
- 'Path' : re.escape("iota"),
+ 'Path' : '.*%siota' % re.escape(os.sep),
'Repository Root' : sbox.repo_url,
'Repository UUID' : wc_uuid,
}]
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1143926&r1=1143925&r2=1143926&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Thu Jul 7 17:12:12 2011
@@ -925,7 +925,7 @@ def run_and_verify_info(expected_infos,
if value is not None and key not in actual:
raise main.SVNLineUnequal("Expected key '%s' (with value '%s') "
"not found" % (key, value))
- if value is not None and not re.search(value, actual[key]):
+ if value is not None and not re.match(value, actual[key]):
raise verify.SVNUnexpectedStdout("Values of key '%s' don't match:\n"
" Expected: '%s' (regex)\n"
" Found: '%s' (string)\n"
Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1143926&r1=1143925&r2=1143926&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Thu Jul 7 17:12:12 2011
@@ -479,7 +479,7 @@ def ensure_tree_conflict(sbox, operation
incoming_right_rev = source_right_rev
else:
incoming_right_rev = head_rev
- expected_info = { 'Tree conflict' : operation +
+ expected_info = { 'Tree conflict' : '.* upon ' + operation +
r'.* \((none|(file|dir).*' +
re.escape(victim_name + '@' + str(incoming_left_rev)) + r')' +
r'.* \((none|(file|dir).*' +