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, 6 insertions, 4 deletions

diff --git a/test/Delete.py b/test/Delete.py
index 63e4ab63..47f9d81e 100644
--- a/test/Delete.py
+++ b/test/Delete.py
@@ -29,7 +29,6 @@ Verify that the Delete() Action works.
 """
 
 import os.path
-import string
 
 import TestSCons
 
@@ -180,8 +179,11 @@ test.write('f14.in', "f14.in\n")
 
 test.run(status=2, stderr=None)
 
-stderr = test.stderr()
-test.fail_test(string.find(stderr, "No such file or directory") == -1 and
-               string.find(stderr, "The system cannot find the path specified") == -1)
+fail_strings = [
+    "No such file or directory",
+    "The system cannot find the path specified",
+]
+
+test.must_contain_any_line(test.stderr(), fail_strings)
 
 test.pass_test()