svn commit: r1434629 - /subversion/trunk/subversion/tests/cmdline/externals_tests.py

[st...@apache.org]

Author: stsp
Date: Thu Jan 17 11:59:29 2013
New Revision: 1434629

URL: http://svn.apache.org/viewvc?rev=1434629&view=rev
Log:
* subversion/tests/cmdline/externals_tests.py
  (move_with_file_externals): Make this test fail in the same way as the
   reproduction recipe for issue #4293, and mark it as XFAIL.

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=1434629&r1=1434628&r2=1434629&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Jan 17 11:59:29 2013
@@ -2992,23 +2992,22 @@ def list_include_externals(sbox):
   exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
     "OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', C_url)
 
+@XFail()
 @Issue(4293)  
 def move_with_file_externals(sbox):
   "move with file externals"
 
-  sbox.build(read_only = True)
+  sbox.build()
   wc_dir         = sbox.wc_dir
   repo_url       = sbox.repo_url
 
-  sbox.simple_propset('svn:externals', repo_url + '/iota@1 iota-1\n' +
-                                       repo_url + '/iota   iota-2\n' +
-                                       repo_url + '/iota   iota-3\n',
-                      '', 'A', 'A/D')
-
-  # Bring in the file externals
-  sbox.simple_update('')
-  
-  sbox.simple_move('A', 'A_moved')
+  sbox.simple_propset('svn:externals', '^/A/mu@1 mu-1\n', 'A/D')
+  sbox.simple_commit()
+
+  sbox.simple_update()
+  sbox.simple_move('A/D', 'A/D_moved')
+  sbox.simple_commit()
+  sbox.simple_update()
 
 @Issue(4815)
 def pinned_externals(sbox):