Author: brane
Date: Fri Feb 27 02:41:50 2015
New Revision: 1662626
URL: http://svn.apache.org/r1662626
Log:
Follow up to r1662620: Make tests work on Windows.
* subversion/tests/cmdline/info_tests.py
(info_item_simple_multiple, info_item_uncommmitted):
Adjust expected output to accept both forward- and backslashes in paths.
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=1662626&r1=1662625&r2=1662626&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Fri Feb 27 02:41:50
2015
@@ -652,12 +652,12 @@ def info_item_simple_multiple(sbox):
sbox.build(read_only=True)
svntest.actions.run_and_verify_svn(
- r'^jrandom\s+\S+/info_tests-\d+(/[^/]+)?$', [],
+ r'^jrandom\s+\S+(/|\\)info_tests-\d+((/|\\)[^/\\]+)?$', [],
'info', '--show-item=last-changed-author',
'--depth=immediates', sbox.ospath(''))
svntest.actions.run_and_verify_svn(
- r'^1\s+\S+/info_tests-\d+/[^/]+$', [],
+ r'^1\s+\S+(/|\\)info_tests-\d+(/|\\)[^/\\]+$', [],
'info', '--show-item=last-changed-rev',
sbox.ospath('A'), sbox.ospath('iota'))
@@ -706,12 +706,12 @@ def info_item_uncommmitted(sbox):
sbox.ospath('newdir'))
svntest.actions.run_and_verify_svn(
- r'\s+\S+/new(file|dir)', [],
+ r'\s+\S+(/|\\)new(file|dir)', [],
'info', '--show-item=last-changed-date',
sbox.ospath('newfile'), sbox.ospath('newdir'))
svntest.actions.run_and_verify_svn(
- r'\^/new(file|dir)\s+\S+/new(file|dir)', [],
+ r'\^/new(file|dir)\s+\S+(/|\\)new(file|dir)', [],
'info', '--show-item=relative-url',
sbox.ospath('newfile'), sbox.ospath('newdir'))
