diff options
| author | Valeri Karpov <valeri.karpov@10gen.com> | 2014-02-18 16:03:52 -0500 |
|---|---|---|
| committer | Matt Kangas <matt.kangas@mongodb.com> | 2014-02-21 14:49:38 -0500 |
| commit | 68eca9bf07dd3506b8cd4eba8bd5f39a10ad8baf (patch) | |
| tree | 9979e866cdf80a0d4bddbafcfcb34b6d17694f20 /buildscripts | |
| parent | f9fac71d2e5bc70586c6d68acea5a4adc7a09c27 (diff) | |
| download | mongo-68eca9bf07dd3506b8cd4eba8bd5f39a10ad8baf.tar.gz | |
Don't count skipped tests as successful in smoke.py
Signed-off-by: Matt Kangas <matt.kangas@mongodb.com>
Diffstat (limited to 'buildscripts')
| -rwxr-xr-x | buildscripts/smoke.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/buildscripts/smoke.py b/buildscripts/smoke.py index 6dcaa2834c8..33ea615cfec 100755 --- a/buildscripts/smoke.py +++ b/buildscripts/smoke.py @@ -430,9 +430,6 @@ def runTest(test, result): (path, usedb) = test (ignore, ext) = os.path.splitext(path) - if skipTest(path): - print "skipping " + path - return if file_of_commands_mode: # smoke.py was invoked like "--mode files --from-file foo", # so don't try to interpret the test path too much @@ -653,19 +650,22 @@ def run_tests(tests): test_result["test_file"] = test_path try: - fails.append(test) - runTest(test, test_result) - fails.pop() - winners.append(test) + if skipTest(test_path): + test_result["status"] = "skip" + + print "skipping " + test_path + else: + fails.append(test) + runTest(test, test_result) + fails.pop() + winners.append(test) + + test_result["status"] = "pass" test_result["end"] = time.time() test_result["elapsed"] = test_result["end"] - test_result["start"] - test_result["status"] = "pass" test_report["results"].append( test_result ) - if skipTest(test_path): - test_result["status"] = "skip" - if small_oplog or small_oplog_rs: master.wait_for_repl() # check the db_hashes |