You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/03/01 02:35:17 UTC
svn commit: r1295372 -
/subversion/trunk/subversion/tests/cmdline/externals_tests.py
Author: stsp
Date: Thu Mar 1 01:35:16 2012
New Revision: 1295372
URL: http://svn.apache.org/viewvc?rev=1295372&view=rev
Log:
* subversion/tests/cmdline/externals_tests.py
(file_externals_different_url): Extend this test to cover the problem
where 'svn status' used to error out with "assertion failed:
repos_id == last_repos_id" as reported in various users@ posts
(e.g. http://svn.haxx.se/users/archive-2011-11/0527.shtml).
As of 1.7.3 this is no longer an assertion but an error message
because of r1293813.
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=1295372&r1=1295371&r2=1295372&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Mar 1 01:35:16 2012
@@ -1916,8 +1916,19 @@ def file_externals_different_url(sbox):
'rr-e-1' : Item(status='A '),
})
+ expected_status = actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('', status=' M')
+ expected_status.add({
+ 'r2-e-1' : Item(status=' ', wc_rev='1', switched='X'),
+ 'r1-e-1' : Item(status=' ', wc_rev='1', switched='X'),
+ 'r1-e-2' : Item(status=' ', wc_rev='1', switched='X'),
+ 'rr-e-1' : Item(status=' ', wc_rev='1', switched='X'),
+ 'r2-e-2' : Item(status=' ', wc_rev='1', switched='X'),
+ })
+
svntest.actions.run_and_verify_update(wc_dir,
- expected_output, None, None, None)
+ expected_output, None,
+ expected_status, None)
# Verify that all file external URLs are descendants of r1_url
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']:
@@ -1934,7 +1945,8 @@ def file_externals_different_url(sbox):
})
svntest.actions.run_and_verify_update(wc_dir,
- expected_output, None, None, None)
+ expected_output, None,
+ expected_status, None)
# Verify that all file external URLs are descendants of r2_url
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']: