[Docutils-checkins] r5811 - trunk/docutils/test/test_functional.py

[<mi...@us...>]

Author: milde
Date: 2008-12-09 15:20:11 +0100 (Tue, 09 Dec 2008)
New Revision: 5811

Modified:
   trunk/docutils/test/test_functional.py
Log:
test_functional.py: Less verbose but still helpful output.

Do not show full output (but point to output file) if there is no expected
output.

Modified: trunk/docutils/test/test_functional.py
===================================================================
--- trunk/docutils/test/test_functional.py	2008-12-09 02:26:00 UTC (rev 5810)
+++ trunk/docutils/test/test_functional.py	2008-12-09 14:20:11 UTC (rev 5811)
@@ -136,14 +136,15 @@
         # by publish_file):
         output = docutils.core.publish_file(**params)
         # Get the expected output *after* writing the actual output.
-        no_expected = ('Cannot find expected output at %s\n' 
-                       'If the actual output is correct, move it'
+        no_expected = ('Cannot find expected output at %(exp)s\n' 
+                       'If the output in %(out)s \nis correct, move it'
                        'to the expected/ dir and check it in:\n'
-                       '  mv %s %s\n'
-                       '  svn commit -m "<comment>" %s\n\n'
-                       % (expected_path,
-                          params['destination_path'], expected_path, expected_path)
-                      ) + output
+                       '  mv %(out)s %(exp)s\n'
+                       '  svn add %(exp)s\n'
+                       '  svn commit -m "<comment>" %(exp)s\n'
+                       % {'exp':expected_path, 
+                          'out': params['destination_path']}
+                      )
         self.assert_(os.access(expected_path, os.R_OK), no_expected)
         f = open(expected_path, 'rU')
         expected = f.read()