diff options
Diffstat (limited to 'test/TEX')
-rw-r--r-- | test/TEX/bibliography.py | 4 | ||||
-rw-r--r-- | test/TEX/makeindex.py | 6 | ||||
-rw-r--r-- | test/TEX/multi-run.py | 22 |
3 files changed, 7 insertions, 25 deletions
diff --git a/test/TEX/bibliography.py b/test/TEX/bibliography.py index a1943c0..1e09af2 100644 --- a/test/TEX/bibliography.py +++ b/test/TEX/bibliography.py @@ -31,8 +31,6 @@ be aware of the necessary created bibliography files. Test configuration contributed by Christopher Drexler. """ -import string - import TestSCons test = TestSCons.TestSCons() @@ -111,7 +109,7 @@ test.must_exist(test.workpath('simple.blg')) test.run(arguments = '-c .') x = "Could not remove 'simple.aux': No such file or directory" -test.fail_test(string.find(test.stdout(), x) != -1) +test.must_not_contain_any_line(test.stdout(), [x]) test.must_not_exist(test.workpath('simple.aux')) test.must_not_exist(test.workpath('simple.bbl')) diff --git a/test/TEX/makeindex.py b/test/TEX/makeindex.py index 765ef4d..a41c9a7 100644 --- a/test/TEX/makeindex.py +++ b/test/TEX/makeindex.py @@ -31,8 +31,6 @@ aware of the necessary created index files. Test configuration courtesy Joel B. Mohler. """ -import string - import TestSCons test = TestSCons.TestSCons() @@ -93,9 +91,9 @@ test.must_not_exist(test.workpath('no_index.ind')) test.run(arguments = '-c .') x = "Could not remove 'no_index.aux': No such file or directory" -test.fail_test(string.find(test.stdout(), x) != -1) +test.must_not_contain_any_line(test.stdout(), [x]) x = "Could not remove 'simple.aux': No such file or directory" -test.fail_test(string.find(test.stdout(), x) != -1) +test.must_not_contain_any_line(test.stdout(), [x]) test.must_not_exist(test.workpath('simple.aux')) test.must_not_exist(test.workpath('simple.idx')) diff --git a/test/TEX/multi-run.py b/test/TEX/multi-run.py index 2659e16..acca069 100644 --- a/test/TEX/multi-run.py +++ b/test/TEX/multi-run.py @@ -32,8 +32,6 @@ correctly re-run to resolve undefined references. Also verifies that package warnings are caught and re-run as needed. """ -import string - import TestSCons test = TestSCons.TestSCons() @@ -151,10 +149,7 @@ env.PDF( "foo.tex" ) test.must_exist(['work1', 'foo.bbl']) foo_log = test.read(['work1', 'foo.log']) - if string.find(foo_log, 'undefined references') != -1: - print 'foo.log contains "undefined references":' - print foo_log - test.fail_test(1) + test.must_not_contain_any_line(foo_log, ['undefined references'], 'foo.log') test.write(['work3', 'SConstruct'], """\ import os @@ -168,10 +163,7 @@ env.DVI( "foo3.tex" ) test.run(chdir = 'work3', arguments = '.') foo_log = test.read(['work3', 'foo3.log']) - if string.find(foo_log, 'Rerun LaTeX') != -1: - print 'foo.log contains "Rerun LaTeX":' - print foo_log - test.fail_test(1) + test.must_not_contain_any_line(foo_log, ['Rerun LaTeX'], 'foo3.log') @@ -193,10 +185,7 @@ env.PDF( "foo.ltx" ) test.must_exist(['work2', 'foo.bbl']) foo_log = test.read(['work2', 'foo.log']) - if string.find(foo_log, 'undefined references') != -1: - print 'foo.log contains "undefined references":' - print foo_log - test.fail_test(1) + test.must_not_contain_any_line(foo_log, ['undefined references'], 'foo.log') test.write(['work3', 'SConstruct'], """\ import os @@ -211,10 +200,7 @@ env.PDF( "foo3.tex" ) test.run(chdir = 'work3', arguments = '.') foo_log = test.read(['work3', 'foo3.log']) - if string.find(foo_log, 'Rerun LaTeX') != -1: - print 'foo.log contains "Rerun LaTeX":' - print foo_log - test.fail_test(1) + test.must_not_contain_any_line(foo_log, ['Rerun LaTeX'], 'foo3.log') test.write(['work4', 'SConstruct'], """\ |