svn commit: r1414262 - /subversion/trunk/subversion/tests/cmdline/getopt_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Tue Nov 27 16:54:29 2012
New Revision: 1414262

URL: http://svn.apache.org/viewvc?rev=1414262&view=rev
Log:
* subversion/tests/cmdline/getopt_tests.py
  (run_one_test): Simplify by using a standard verification function.

Modified:
    subversion/trunk/subversion/tests/cmdline/getopt_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests.py?rev=1414262&r1=1414261&r2=1414262&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests.py Tue Nov 27 16:54:29 2012
@@ -167,33 +167,11 @@ def run_one_test(sbox, basename, *vararg
   actual_stdout = process_lines(actual_stdout)
   actual_stderr = process_lines(actual_stderr)
 
-  if exp_stdout != actual_stdout:
-    logger.warn("Standard output does not match.")
-    logger.warn("Expected standard output:")
-    logger.warn("=====")
-    for x in exp_stdout:
-      logger.warn(x.rstrip())
-    logger.warn("=====")
-    logger.warn("Actual standard output:")
-    logger.warn("=====")
-    for x in actual_stdout:
-      logger.warn(x.rstrip())
-    logger.warn("=====")
-    raise svntest.Failure
-
-  if exp_stderr != actual_stderr:
-    logger.warn("Standard error does not match.")
-    logger.warn("Expected standard error:")
-    logger.warn("=====")
-    for x in exp_stderr:
-      logger.warn(x.rstrip())
-    logger.warn("=====")
-    logger.warn("Actual standard error:")
-    logger.warn("=====")
-    for x in actual_stderr:
-      logger.warn(x.rstrip())
-    logger.warn("=====")
-    raise svntest.Failure
+  svntest.verify.compare_and_display_lines("Standard output does not match.",
+                                           "STDOUT", exp_stdout, actual_stdout)
+
+  svntest.verify.compare_and_display_lines("Standard error does not match.",
+                                           "STDERR", exp_stderr, actual_stderr)
 
 def getopt_no_args(sbox):
   "run svn with no arguments"