You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/01/20 00:05:56 UTC
svn commit: r1435753 -
/subversion/trunk/subversion/tests/cmdline/update_tests.py
Author: rhuijben
Date: Sat Jan 19 23:05:56 2013
New Revision: 1435753
URL: http://svn.apache.org/viewvc?rev=1435753&view=rev
Log:
* subversion/tests/cmdline/update_tests.py
(update_removes_switched): Minor code cleanup. No functional changes.
Modified:
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1435753&r1=1435752&r2=1435753&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Sat Jan 19 23:05:56 2013
@@ -6156,16 +6156,24 @@ def break_moved_replaced_dir(sbox):
@Issue(4295)
def update_removes_switched(sbox):
"update completely removes switched node"
+
sbox.build(create_wc = False)
- wc_dir = sbox.wc_dir
- svntest.main.run_svn(None, 'cp', sbox.repo_url + '/A',
- sbox.repo_url + '/AA', '-m', 'Q')
+ wc_dir = sbox.wc_dir
+ repo_url = sbox.repo_url
- svntest.main.run_svn(None, 'co', sbox.repo_url + '/A', sbox.wc_dir)
- svntest.main.run_svn(None, 'switch', sbox.repo_url + '/AA/B', sbox.wc_dir + '/B')
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'cp', repo_url + '/A',
+ repo_url + '/AA', '-m', 'Q')
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'co', repo_url + '/A', sbox.wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'switch', repo_url + '/AA/B',
+ wc_dir + '/B')
- svntest.main.run_svn(None, 'rm', sbox.repo_url + '/AA/B', '-m', 'Q')
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'rm', repo_url + '/AA/B', '-m', 'Q')
expected_output = svntest.wc.State(wc_dir, {
'B' : Item(status='D '),