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.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@5811 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 8 insertions, 7 deletions

diff --git a/docutils/test/test_functional.py b/docutils/test/test_functional.py
index b95cfe1c3..998a4ef03 100755
--- a/docutils/test/test_functional.py
+++ b/docutils/test/test_functional.py
@@ -136,14 +136,15 @@ class FunctionalTestCase(DocutilsTestSupport.CustomTestCase):
         # 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()