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, 7 insertions, 3 deletions

diff --git a/test/ENV.py b/test/ENV.py
index 9a39f306..d7c543da 100644
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -79,7 +79,11 @@ print 'FOO:', os.environ['FOO']
 
 test.run()
 
-test.fail_test(string.find(test.stdout(), "LIST: foo%sbar"%os.pathsep) == -1)
-test.fail_test(string.find(test.stdout(), "FOO: foo") == -1)
+expect = [
+    "LIST: foo%sbar" % os.pathsep,
+    "FOO: foo",
+]
+
+test.must_contain_all_lines(test.stdout(), expect)
 
 test.pass_test()