svn commit: r1129338 - in /subversion/trunk/subversion/tests/cmdline: externals_tests.py svntest/wc.py

[rh...@apache.org]

Author: rhuijben
Date: Mon May 30 20:04:54 2011
New Revision: 1129338

URL: http://svn.apache.org/viewvc?rev=1129338&view=rev
Log:
Fix issue #3351 again, or at least fix the test to see that this issues is
already fixed by the recent externals work.

* subversion/tests/cmdline/externals_tests.py
  (update_lose_file_external): Remove XFail marker. Expect to see external
    removal on update.

* subversion/tests/cmdline/svntest/wc.py
  (_re_parse_co_skipped): Match on 'Removed external'.

Modified:
    subversion/trunk/subversion/tests/cmdline/externals_tests.py
    subversion/trunk/subversion/tests/cmdline/svntest/wc.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=1129338&r1=1129337&r2=1129338&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Mon May 30 20:04:54 2011
@@ -1171,7 +1171,6 @@ def binary_file_externals(sbox):
 #----------------------------------------------------------------------
 
 # Issue #3351.
-@XFail()
 @Issue(3351)
 def update_lose_file_external(sbox):
   "delete a file external"
@@ -1230,7 +1229,9 @@ def update_lose_file_external(sbox):
                                         expected_status, None, wc_dir)
 
   # try to actually get rid of the external via an update
-  expected_output = svntest.wc.State(wc_dir, {})
+  expected_output = svntest.wc.State(wc_dir, {
+    'A/C/external'      : Item(verb='Removed external')
+  })
 
   # (re-use above expected_disk)
   expected_disk.tweak('A/C', props = {})
@@ -1239,6 +1240,9 @@ def update_lose_file_external(sbox):
   # (re-use above expected_status)
   expected_status.tweak(wc_rev = 3)
 
+  # And assume that the external will be removed.
+  expected_status.remove('A/C/external')
+
   svntest.actions.run_and_verify_update(wc_dir,
                                         expected_output,
                                         expected_disk,

Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1129338&r1=1129337&r2=1129338&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Mon May 30 20:04:54 2011
@@ -91,7 +91,8 @@ _re_parse_checkout = re.compile('^([RMAG
                                 '([B ])'
                                 '([CAUD ])\s+'
                                 '(.+)')
-_re_parse_co_skipped = re.compile('^(Restored|Skipped)\s+\'(.+)\'( --.*)?')
+_re_parse_co_skipped = re.compile('^(Restored|Skipped|Removed external)'
+                                  '\s+\'(.+)\'(( --|: ).*)?')
 _re_parse_co_restored = re.compile('^(Restored)\s+\'(.+)\'')
 
 # Lines typically have a verb followed by whitespace then a path.