diff options
| author | Steven Knight <knight@baldmt.com> | 2008-10-08 00:58:12 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-10-08 00:58:12 (GMT) |
| commit | 2e72e2bba6d804961beaf8f2298138754e36ca24 (patch) | |
| tree | 803afe9991218fcde7c656d868a4d1c198ba8bd3 /test/DVIPDF | |
| parent | 2dabf8c7f55ef2b65f0d2e216d2f9641575071d6 (diff) | |
| download | SCons-2e72e2bba6d804961beaf8f2298138754e36ca24.zip SCons-2e72e2bba6d804961beaf8f2298138754e36ca24.tar.gz SCons-2e72e2bba6d804961beaf8f2298138754e36ca24.tar.bz2 | |
Update test scripts with more information must_*() methods.
Diffstat (limited to 'test/DVIPDF')
| -rw-r--r-- | test/DVIPDF/DVIPDF.py | 19 | ||||
| -rw-r--r-- | test/DVIPDF/DVIPDFFLAGS.py | 19 |
2 files changed, 18 insertions, 20 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() diff --git a/test/DVIPDF/DVIPDFFLAGS.py b/test/DVIPDF/DVIPDFFLAGS.py index cc90105..8d94b5a 100644 --- a/test/DVIPDF/DVIPDFFLAGS.py +++ b/test/DVIPDF/DVIPDFFLAGS.py @@ -25,9 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string -import sys + import TestSCons _python_ = TestSCons._python_ @@ -104,9 +103,9 @@ test.write('test2.tex', r"""This is a .tex test. test.run(arguments = '.', stderr = None) -test.fail_test(test.read('test1.pdf') != " -x\nThis is a .dvi test.\n") +test.must_match('test1.pdf', " -x\nThis is a .dvi test.\n") -test.fail_test(test.read('test2.pdf') != " -x\nThis is a .tex test.\n") +test.must_match('test2.pdf', " -x\nThis is a .tex test.\n") @@ -156,20 +155,20 @@ This is the %s LaTeX 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() |