svn commit: r1435635 - /subversion/trunk/subversion/tests/cmdline/update_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Sat Jan 19 18:37:02 2013
New Revision: 1435635

URL: http://svn.apache.org/viewvc?rev=1435635&view=rev
Log:
* subversion/tests/cmdline/update_tests.py
  (update_removes_switched): Add work in progress on test for an issue reported
    at users@s.a.o where a switched target is deleted.
    It appears to fail much easier on trunk than on 1.7, which might indicate
    we have a serious regression in the reporter.. Or that I made some other error.
  (test_list): Add test.

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=1435635&r1=1435634&r2=1435635&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Sat Jan 19 18:37:02 2013
@@ -6153,6 +6153,46 @@ def break_moved_replaced_dir(sbox):
   expected_status.tweak('A/B/E2', moved_from=None)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
+@XFail()
+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')
+
+  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.main.run_svn(None, 'rm', sbox.repo_url + '/AA/B', '-m', 'Q')
+
+  expected_output = svntest.wc.State(wc_dir, {
+  })
+  expected_status = svntest.wc.State(wc_dir, {
+  })
+
+  # This update should remove 'A/B', because its in-repository location is removed
+  # ### But somehow this just fails much earlier than in 1.7... Serious regression???
+  # svn: E160005: Target path '/AA/B' does not exist.
+  # (This should have been verified at r2, where it DOES exist. 
+  #  It was only deleted at r3.)
+  svntest.actions.run_and_verify_update(wc_dir,
+                                        None,
+                                        None,
+                                        None)
+
+  #expected_output = svntest.wc.State(wc_dir, {
+  #})
+  #expected_status = svntest.wc.State(wc_dir, {
+  #})
+  #
+  # But I call it XFail that the node is not brought back in by this update
+  #svntest.actions.run_and_verify_update(wc_dir,
+  #                                     expected_output,
+  #                                      None,
+  #                                      expected_status)
+
 #######################################################################
 # Run the tests
 
@@ -6231,6 +6271,7 @@ test_list = [ None,
               update_deleted,
               break_moved_dir_edited_leaf_del,
               break_moved_replaced_dir,
+              update_removes_switched,
              ]
 
 if __name__ == '__main__':