svn commit: r1443276 - /subversion/trunk/subversion/tests/cmdline/svntest/verify.py

[ju...@apache.org]

Author: julianfoad
Date: Wed Feb  6 23:53:39 2013
New Revision: 1443276

URL: http://svn.apache.org/viewvc?rev=1443276&view=rev
Log:
* subversion/tests/cmdline/svntest/verify.py
  (ExpectedOutput): Don't support 'actual' being 'None', as it is an
    unhelpful special case.
  (compare_and_display_lines): Same.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/verify.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/verify.py?rev=1443276&r1=1443275&r2=1443276&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Wed Feb  6 23:53:39 2013
@@ -119,14 +119,13 @@ class ExpectedOutput(object):
 
   def matches(self, actual, except_re=None):
     """Return whether SELF.expected matches ACTUAL (which may be a list
-    of newline-terminated lines, or a single string).  ACTUAL may be None,
-    meaning an empty list."""
+       of newline-terminated lines, or a single string).
+    """
+    assert actual is not None
     expected = self.expected
     if not isinstance(expected, list):
       expected = [expected]
-    if actual is None:
-      actual = []
-    elif not isinstance(actual, list):
+    if not isinstance(actual, list):
       actual = [actual]
 
     if except_re:
@@ -361,6 +360,7 @@ def compare_and_display_lines(message, l
   ### It'd be nicer to use createExpectedOutput() here, but its
   ### semantics don't match all current consumers of this function.
   assert expected is not None
+  assert actual is not None
   if not isinstance(expected, ExpectedOutput):
     expected = ExpectedOutput(expected)