You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ne...@apache.org on 2012/11/15 22:22:36 UTC
svn commit: r1410022 -
/subversion/trunk/subversion/tests/cmdline/externals_tests.py
Author: neels
Date: Thu Nov 15 21:22:35 2012
New Revision: 1410022
URL: http://svn.apache.org/viewvc?rev=1410022&view=rev
Log:
* subversion/tests/cmdline/externals_tests.py
(duplicate_targets): Blind attempt to fix windows buildbot.
Modified:
subversion/trunk/subversion/tests/cmdline/externals_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1410022&r1=1410021&r2=1410022&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Nov 15 21:22:35 2012
@@ -2888,9 +2888,9 @@ def duplicate_targets(sbox):
svn ps svn:externals "^/A/B/E barf\n^/A/D/G barf" .
svn ps svn:externals "^/A/B/E barf/.\n^/A/D/G ./barf" .
svn ps svn:externals "^/A/B/E ././barf\n^/A/D/G .//barf" .
- svn pl -v .
+ svn pg svn:externals .
svn ps svn:externals "^/A/B/E ok" .
- svn pl -v .
+ svn pg svn:externals .
""")
sbox.build()
@@ -2918,9 +2918,11 @@ def duplicate_targets(sbox):
actions.run_and_verify_svn2('OUTPUT', [], expected_stderr, 1, 'ps',
'svn:externals', '^/A/B/E ././barf\n^/A/D/G .//barf', wc_dir)
- # svn pl -v .
- actions.run_and_verify_svn2('OUTPUT', [], [], 0, 'pl', '-v',
- wc_dir)
+ # svn pg svn:externals .
+ expected_stdout = []
+
+ actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'pg',
+ 'svn:externals', wc_dir)
# svn ps svn:externals "^/A/B/E ok" .
expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
@@ -2928,16 +2930,15 @@ def duplicate_targets(sbox):
actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
'svn:externals', '^/A/B/E ok', wc_dir)
- # svn pl -v .
- expected_stdout = [
- "Properties on '" + wc_dir + "':\n",
- ' svn:externals\n',
- ' ^/A/B/E ok\n',
- ' \n',
- ]
+ # svn pg svn:externals .
+ expected_stdout = verify.UnorderedOutput([
+ '^/A/B/E ok\n',
+ '\n'
+ ])
+
+ actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'pg',
+ 'svn:externals', wc_dir)
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'pl', '-v',
- wc_dir)
########################################################################