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, 1 insertions, 13 deletions

diff --git a/test/exceptions.py b/test/exceptions.py
index 98e3e834..12efdf0a 100644
--- a/test/exceptions.py
+++ b/test/exceptions.py
@@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import re
-import string
 import sys
 import TestSCons
 import TestCmd
@@ -122,18 +121,7 @@ expected_stderr_list = [
 
 test.run(arguments = '-j7 -k .', status = 2, stderr = None)
 
-missing = []
-for es in expected_stderr_list:
-    if string.find(test.stderr(), es) == -1:
-        missing.append(es)
-
-if missing:
-    sys.stderr.write("Missing the following lines from stderr:\n")
-    for m in missing:
-        sys.stderr.write(m)
-    sys.stderr.write('STDERR ===============================================\n')
-    sys.stderr.write(test.stderr())
-    test.fail_test(1)
+test.must_contain_all_lines(test.stderr(), expected_stderr_list)
 
 
 test.pass_test()