Remove the recently-removed _scons_sets15.py from MANIFEST.in.

[scons.git] / test / diskcheck.py

diff --git a/test/diskcheck.py b/test/diskcheck.py
index b8ef2fe7a7e69a000bbdcbf95f0e46fb39baadca..adbeea1e02aefd116850132e5631dc2087a135e6 100644 (file)
--- 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,8 +72,14 @@ 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"])
 
 
 
 test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: