diff options
| author | Steven Knight <knight@baldmt.com> | 2010-05-27 22:04:24 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-05-27 22:04:24 (GMT) |
| commit | 1611fe9bdefe760e4fbfd0a4ae85892a3094e19e (patch) | |
| tree | f9422c46d0346aa65609255c58b53e47b01e0e7d /test/GetBuildFailures | |
| parent | 2ad61d7685b57789e46e2a8636d518f2ccbf3229 (diff) | |
| download | SCons-1611fe9bdefe760e4fbfd0a4ae85892a3094e19e.zip SCons-1611fe9bdefe760e4fbfd0a4ae85892a3094e19e.tar.gz SCons-1611fe9bdefe760e4fbfd0a4ae85892a3094e19e.tar.bz2 | |
Update QMTEst/Test{Cmd,Common}.py to version 1.1 from upstream:
* incorporate and update the Python 3.0 fixer work by Greg:
* full conversion to using subprocess for execution;
* rename exactly_contain_all_lines() to must_contain_exactly_lines();
* other minor fixes and stylistic cleanups.
Diffstat (limited to 'test/GetBuildFailures')
| -rw-r--r-- | test/GetBuildFailures/option-k.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/GetBuildFailures/option-k.py b/test/GetBuildFailures/option-k.py index 142fbf4..b4e8d54 100644 --- a/test/GetBuildFailures/option-k.py +++ b/test/GetBuildFailures/option-k.py @@ -91,8 +91,8 @@ scons: *** [f5] Error 1 """ test.run(arguments = '-k .', status = 2, stdout=None, stderr=None) -test.exactly_contain_all_lines(test.stdout(), expect_stdout, title='stdout') -test.exactly_contain_all_lines(test.stderr(), expect_stderr, title='stderr') +test.must_contain_exactly_lines(test.stdout(), expect_stdout, title='stdout') +test.must_contain_exactly_lines(test.stderr(), expect_stderr, title='stderr') test.must_match(test.workpath('f3'), 'f3.in\n') test.must_not_exist(test.workpath('f4')) |