Update test scripts with more information must_*() methods.

1 files changed, 9 insertions, 10 deletions

diff --git a/test/DVIPDF/DVIPDF.py b/test/DVIPDF/DVIPDF.py
index 6f62f34..43bb106 100644
--- a/test/DVIPDF/DVIPDF.py
+++ b/test/DVIPDF/DVIPDF.py
@@ -25,9 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -100,9 +99,9 @@ test.write('test2.tex', r"""This is a .tex test.
 
 test.run(arguments = '.', stderr = None)
 
-test.fail_test(test.read('test1.pdf') != "This is a .dvi test.\n")
+test.must_match('test1.pdf', "This is a .dvi test.\n")
 
-test.fail_test(test.read('test2.pdf') != "This is a .tex test.\n")
+test.must_match('test2.pdf', "This is a .tex test.\n")
 
 
 
@@ -145,20 +144,20 @@ This is the %s TeX file.
 
     test.run(arguments = 'foo.pdf', stderr = None)
 
-    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+    test.must_not_exist(test.workpath('wrapper.out'))
 
-    test.fail_test(not os.path.exists(test.workpath('foo.pdf')))
+    test.must_exist(test.workpath('foo.pdf'))
 
     test.run(arguments = 'xxx.pdf', stderr = None)
 
-    test.fail_test(os.path.exists(test.workpath('wrapper.out')))
+    test.must_not_exist(test.workpath('wrapper.out'))
 
-    test.fail_test(os.path.exists(test.workpath('xxx.dvi')))
+    test.must_not_exist(test.workpath('xxx.dvi'))
 
     test.run(arguments = 'bar.pdf', stderr = None)
 
-    test.fail_test(test.read('wrapper.out') != "dvipdf bar.dvi bar.pdf\n")
+    test.must_match('wrapper.out', "dvipdf bar.dvi bar.pdf\n")
 
-    test.fail_test(not os.path.exists(test.workpath('bar.pdf')))
+    test.must_exist(test.workpath('bar.pdf'))
 
 test.pass_test()