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

[rh...@apache.org]

Author: rhuijben
Date: Tue Mar 29 13:03:30 2016
New Revision: 1737004

URL: http://svn.apache.org/viewvc?rev=1737004&view=rev
Log:
Following up on r1735932 update expected result for the issue #4420 test.

* subversion/tests/cmdline/externals_tests.py
  (file_external_unversioned_obstruction): Update expected result. Extend test
    to verify everything the old test did.

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=1737004&r1=1737003&r2=1737004&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Tue Mar 29 13:03:30 2016
@@ -3252,18 +3252,28 @@ def file_external_unversioned_obstructio
 
   # Update reports a tree-conflict but status doesn't show any such
   # conflict.  I'm no sure whether this is correct.
-  expected_output = svntest.wc.State(wc_dir, {
-      'A'        : Item(status=' U'),
-      'A/mu-ext' : Item(status='  ', treeconflict='A'),
-      })
   expected_disk = svntest.main.greek_state.copy()
   expected_disk.add({
       'A/mu-ext' : Item('unversioned obstruction'),
       })
   expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+  svntest.actions.run_and_verify_svn(
+                  None,
+                  ".*svn: warning: W155014: The file external '.*mu-ext'"
+                  " can not be created because the node exists.*",
+                  'up', wc_dir)
+  svntest.actions.verify_disk(wc_dir, expected_disk)
+  svntest.actions.run_and_verify_status(wc_dir, expected_status)
+
+  os.remove(sbox.ospath('A/mu-ext'))
+
+  expected_output = svntest.wc.State(wc_dir, {
+      'A/mu-ext' : Item(status='A '),
+      })
   expected_status.add({
-      'A/mu-ext' : Item(status='M ', wc_rev='2', switched='X'),
+      'A/mu-ext' : Item(status='  ', wc_rev='2', switched='X'),
       })
+  expected_disk.tweak('A/mu-ext', contents="This is the file 'mu'.\n")
   svntest.actions.run_and_verify_update(wc_dir,
                                         expected_output, expected_disk,
                                         expected_status)