From ae7a444eb590431243f2fed93654148cf2da34e2 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Wed, 8 Oct 2008 00:58:12 +0000 Subject: [PATCH] Update test scripts with more information must_*() methods. git-svn-id: http://scons.tigris.org/svn/scons/trunk@3594 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- test/DVIPDF/DVIPDF.py | 19 +++++++++---------- test/DVIPDF/DVIPDFFLAGS.py | 19 +++++++++---------- test/DVIPS/DVIPS.py | 23 +++++++++++------------ test/DVIPS/DVIPSFLAGS.py | 23 +++++++++++------------ 4 files changed, 40 insertions(+), 44 deletions(-) diff --git a/test/DVIPDF/DVIPDF.py b/test/DVIPDF/DVIPDF.py index 6f62f34a..43bb1063 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 cc901052..8d94b5af 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() diff --git a/test/DVIPS/DVIPS.py b/test/DVIPS/DVIPS.py index 882cb6a2..b50b3cbb 100644 --- a/test/DVIPS/DVIPS.py +++ b/test/DVIPS/DVIPS.py @@ -25,9 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string -import sys + import TestSCons _python_ = TestSCons._python_ @@ -109,13 +108,13 @@ test.write('test4.latex', r"""This is a .latex test. test.run(arguments = '.', stderr = None) -test.fail_test(test.read('test1.ps') != "This is a .dvi test.\n") +test.must_match('test1.ps', "This is a .dvi test.\n") -test.fail_test(test.read('test2.ps') != "This is a .tex test.\n") +test.must_match('test2.ps', "This is a .tex test.\n") -test.fail_test(test.read('test3.ps') != "This is a .ltx test.\n") +test.must_match('test3.ps', "This is a .ltx test.\n") -test.fail_test(test.read('test4.ps') != "This is a .latex test.\n") +test.must_match('test4.ps', "This is a .latex test.\n") @@ -162,9 +161,9 @@ This is the %s LaTeX file. test.run(arguments = 'foo.dvi', 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.dvi'))) + test.must_exist(test.workpath('foo.dvi')) test.run(arguments = 'bar1.ps bar2.ps bar3.ps', stderr = None) @@ -173,10 +172,10 @@ dvips -o bar2.ps bar2.dvi dvips -o bar3.ps bar3.dvi """ - test.fail_test(test.read('wrapper.out') != expect) + test.must_match('wrapper.out', expect) - test.fail_test(not os.path.exists(test.workpath('bar1.ps'))) - test.fail_test(not os.path.exists(test.workpath('bar2.ps'))) - test.fail_test(not os.path.exists(test.workpath('bar3.ps'))) + test.must_exist(test.workpath('bar1.ps')) + test.must_exist(test.workpath('bar2.ps')) + test.must_exist(test.workpath('bar3.ps')) test.pass_test() diff --git a/test/DVIPS/DVIPSFLAGS.py b/test/DVIPS/DVIPSFLAGS.py index 4b70e412..9fac804c 100644 --- a/test/DVIPS/DVIPSFLAGS.py +++ b/test/DVIPS/DVIPSFLAGS.py @@ -25,9 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string -import sys + import TestSCons _python_ = TestSCons._python_ @@ -116,13 +115,13 @@ test.write('test4.latex', r"""This is a .latex test. test.run(arguments = '.', stderr = None) -test.fail_test(test.read('test1.ps') != " -x\nThis is a .dvi test.\n") +test.must_match('test1.ps', " -x\nThis is a .dvi test.\n") -test.fail_test(test.read('test2.ps') != " -x\nThis is a .tex test.\n") +test.must_match('test2.ps', " -x\nThis is a .tex test.\n") -test.fail_test(test.read('test3.ps') != " -x\nThis is a .ltx test.\n") +test.must_match('test3.ps', " -x\nThis is a .ltx test.\n") -test.fail_test(test.read('test4.ps') != " -x\nThis is a .latex test.\n") +test.must_match('test4.ps', " -x\nThis is a .latex test.\n") @@ -169,9 +168,9 @@ This is the %s LaTeX file. test.run(arguments = 'foo.dvi', 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.dvi'))) + test.must_exist(test.workpath('foo.dvi')) test.run(arguments = 'bar1.ps bar2.ps bar3.ps', stderr = None) @@ -180,10 +179,10 @@ dvips -o bar2.ps bar2.dvi dvips -o bar3.ps bar3.dvi """ - test.fail_test(test.read('wrapper.out') != expect) + test.must_match('wrapper.out', expect) - test.fail_test(not os.path.exists(test.workpath('bar1.ps'))) - test.fail_test(not os.path.exists(test.workpath('bar2.ps'))) - test.fail_test(not os.path.exists(test.workpath('bar3.ps'))) + test.must_exist(test.workpath('bar1.ps')) + test.must_exist(test.workpath('bar2.ps')) + test.must_exist(test.workpath('bar3.ps')) test.pass_test() -- 2.26.2