Commonize new string-search-in-output methods:

test.must_contain_all_lines()
test.must_contain_any_line()
test.must_not_contain_any_line()
Update tests to use them.  Remove "import string" lines where the
change made them unnecessary.

1 files changed, 3 insertions, 5 deletions

diff --git a/test/diskcheck.py b/test/diskcheck.py
index b8ef2fe..7e099c1 100644
--- a/test/diskcheck.py
+++ b/test/diskcheck.py
@@ -30,8 +30,6 @@ control where or not we look for on-disk matches files and directories
 that we look up.
 """
 
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -50,7 +48,7 @@ File('subdir')
 test.run()
 
 test.run(arguments='--diskcheck=match', status=2, stderr=None)
-test.fail_test(string.find(test.stderr(), "found where file expected") == -1)
+test.must_contain_all_lines(test.stderr(), ["found where file expected"])
 
 
 
@@ -62,7 +60,7 @@ Dir('file')
 test.run()
 
 test.run(arguments='--diskcheck=match', status=2, stderr=None)
-test.fail_test(string.find(test.stderr(), "found where directory expected") == -1)
+test.must_contain_all_lines(test.stderr(), ["found where directory expected"])
 
 
 
@@ -74,7 +72,7 @@ Dir('file/subdir')
 test.run()
 
 test.run(arguments='--diskcheck=match', status=2, stderr=None)
-test.fail_test(string.find(test.stderr(), "found where directory expected") == -1)
+test.must_contain_all_lines(test.stderr(), ["found where directory expected"])