Author: rhuijben
Date: Tue Apr 19 17:50:59 2011
New Revision: 1095146
URL: http://svn.apache.org/viewvc?rev=1095146&view=rev
Log:
Fix the buildbot failure, by updating the expected results of the externals
tests.
* subversion/tests/cmdline/externals_tests.py
(update_lose_file_external): Don't expect this test to fail. Update
expectations to verify.
* subversion/tests/cmdline/svntest/actions.py
(process_output_for_commit): Accept output after the Committed line.
* subversion/tests/cmdline/svntest/wc.py
(_re_parse_commit_ext): New regex.
(from_commit): Parse externals results.
Modified:
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.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=1095146&r1=1095145&r2=1095146&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Tue Apr 19
17:50:59 2011
@@ -1165,7 +1165,6 @@ def binary_file_externals(sbox):
# Issue #3351.
@Issue(3351)
-@XFail()
def update_lose_file_external(sbox):
"delete a file external"
@@ -1214,10 +1213,12 @@ def update_lose_file_external(sbox):
# commit the property change
expected_output = svntest.wc.State(wc_dir, {
'A/C' : Item(verb='Sending'),
+ 'A/C/external' : Item(verb='Removing external'),
})
# (re-use above expected_status)
expected_status.tweak('A/C', wc_rev = 3)
+ expected_status.remove('A/C/external')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir)
@@ -1231,7 +1232,6 @@ def update_lose_file_external(sbox):
# (re-use above expected_status)
expected_status.tweak(wc_rev = 3)
- expected_status.remove('A/C/external')
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
@@ -1240,6 +1240,8 @@ def update_lose_file_external(sbox):
None, None, None, None, None,
True)
+ probe_paths_missing([os.path.join(wc_dir, 'A', 'C', 'external')])
+
#----------------------------------------------------------------------
@@ -1595,7 +1597,6 @@ def file_external_in_sibling(sbox):
svntest.actions.expected_noop_update_output(2),
[], 'update')
-@XFail()
@Issue(3823)
def file_external_update_without_commit(sbox):
"update a file external without committing target"
Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1095146&r1=1095145&r2=1095146&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Tue Apr 19
17:50:59 2011
@@ -1301,9 +1301,15 @@ def process_output_for_commit(output):
"""Helper for run_and_verify_commit(), also used in the factory."""
# Remove the final output line, and verify that the commit succeeded.
lastline = ""
+ rest = []
+
if len(output):
lastline = output.pop().strip()
+ while len(output) and lastline.startswith('Removing external'):
+ rest.append(lastline)
+ lastline = output.pop().strip()
+
cm = re.compile("(Committed|Imported) revision [0-9]+.")
match = cm.search(lastline)
if not match:
@@ -1326,6 +1332,9 @@ def process_output_for_commit(output):
# whoops, it was important output, put it back.
output.append(lastline)
+ if len(rest):
+ output.extend(rest)
+
return output
Modified: subversion/trunk/subversion/tests/cmdline/svntest/wc.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/wc.py?rev=1095146&r1=1095145&r2=1095146&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/wc.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/wc.py Tue Apr 19 17:50:59
2011
@@ -95,6 +95,7 @@ _re_parse_co_skipped = re.compile('^(Res
_re_parse_co_restored = re.compile('^(Restored)\s+\'(.+)\'')
# Lines typically have a verb followed by whitespace then a path.
+_re_parse_commit_ext = re.compile('^(([A-Za-z]+( [a-z]+)*)) \'(.+)\'( --.*)?')
_re_parse_commit = re.compile('^(\w+( \(bin\))?)\s+(.+)')
@@ -482,6 +483,11 @@ class State:
if line.startswith('DBG:') or line.startswith('Transmitting'):
continue
+ match = _re_parse_commit_ext.search(line)
+ if match:
+ desc[to_relpath(match.group(4))] = StateItem(verb=match.group(1))
+ continue
+
match = _re_parse_commit.search(line)
if match:
desc[to_relpath(match.group(3))] = StateItem(verb=match.group(1))
