[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Handle the expected_is_regexp case in display_lines

From: Ramkumar Ramachandra <artagnon_at_gmail.com>
Date: Tue, 27 Jul 2010 21:43:40 +0530

[[[
Followup r979295 to handle the expected_is_regexp case in
display_lines.

* subversion/tests/cmdline/svntest/verify.py
  (display_lines): When expected is a string and not a list (in the
  expected_in_regexp case), put it in a one-member list, and don't
  output a diff.

Found by: rhuijben
]]]

Index: subversion/tests/cmdline/svntest/verify.py
===================================================================
--- subversion/tests/cmdline/svntest/verify.py (revision 979710)
+++ subversion/tests/cmdline/svntest/verify.py (working copy)
@@ -280,25 +280,25 @@ def display_lines(message, label, expected, actual
     output = 'EXPECTED %s' % label
     if expected_is_regexp:
       output += ' (regexp)'
+ expected = [expected + '\n']
     if expected_is_unordered:
       output += ' (unordered)'
     output += ':'
     print(output)
     for x in expected:
       sys.stdout.write(x)
- if expected_is_regexp:
- sys.stdout.write('\n')
   if actual is not None:
     print('ACTUAL %s:' % label)
     for x in actual:
       sys.stdout.write(x)
 
   # Additionally print unified diff
- print('DIFF ' + ' '.join(output.split(' ')[1:]))
- for x in unified_diff(expected, actual,
- fromfile="EXPECTED %s" % label,
- tofile="ACTUAL %s" % label):
- sys.stdout.write(x)
+ if not expected_is_regexp:
+ print('DIFF ' + ' '.join(output.split(' ')[1:]))
+ for x in unified_diff(expected, actual,
+ fromfile="EXPECTED %s" % label,
+ tofile="ACTUAL %s" % label):
+ sys.stdout.write(x)
 
 def compare_and_display_lines(message, label, expected, actual,
                               raisable=None):
Received on 2010-07-27 18:16:11 CEST

This is an archived mail posted to the Subversion Dev mailing list.