You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/05/03 15:14:54 UTC
svn commit: r1099043 -
/subversion/trunk/subversion/tests/cmdline/info_tests.py
Author: julianfoad
Date: Tue May 3 13:14:54 2011
New Revision: 1099043
URL: http://svn.apache.org/viewvc?rev=1099043&view=rev
Log:
* subversion/tests/cmdline/info_tests.py
(info_with_tree_conflicts): Fix a harmless error in a regular expression.
Modified:
subversion/trunk/subversion/tests/cmdline/info_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=1099043&r1=1099042&r2=1099043&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Tue May 3 13:14:54 2011
@@ -171,7 +171,7 @@ def info_with_tree_conflicts(sbox):
path = os.path.join(G, fname)
# check plain info
- expected_str1 = ".*local %s, incoming %s*" % (reason, action)
+ expected_str1 = ".*local %s, incoming %s.*" % (reason, action)
expected_info = { 'Tree conflict' : expected_str1 }
svntest.actions.run_and_verify_info([expected_info], path)