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

[da...@apache.org]

Author: danielsh
Date: Thu Feb 24 08:31:23 2011
New Revision: 1074068

URL: http://svn.apache.org/viewvc?rev=1074068&view=rev
Log:
* subversion/tests/cmdline/externals_tests.py
  (file_external_in_sibling): New XFail test for issue #3819.
  (test_list): Run it.

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=1074068&r1=1074067&r2=1074068&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Thu Feb 24 08:31:23 2011
@@ -1664,6 +1664,26 @@ def switch_external_on_locally_added_dir
 
   probe_paths_exist([os.path.join(wc_dir, "foo", "exdir_E")])
 
+@XFail()
+@Issue(3819)
+def file_external_in_sibling(sbox):
+  "update a file external in sibling dir"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  # Setup A2/iota as file external to ^/iota
+  externals_prop = "^/iota iota\n"
+  sbox.simple_mkdir("A2")
+  change_external(sbox.ospath('A2'), externals_prop)
+  sbox.simple_update()
+
+  # TODO: Currently, 'svn up' would fail if change_external() didn't commit
+  #       its change.  That needs a separate test...
+
+  expected_stdout = ["Updating '.' ...\n", "At revision 2.\n"]
+  os.chdir(sbox.ospath("A"))
+  svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'update')
 
 ########################################################################
 # Run the tests
@@ -1698,6 +1718,7 @@ test_list = [ None,
               update_modify_file_external,
               update_external_on_locally_added_dir,
               switch_external_on_locally_added_dir,
+              file_external_in_sibling,
              ]
 
 if __name__ == '__main__':