Bug 408383 - vista losing all/part of the tp results for each talos run. a=anodelman r=rcampbell

This commit is contained in:
anodelman@mozilla.com 2007-12-14 12:31:49 -08:00
parent 1b338fa272
commit 0639fad923
2 changed files with 11 additions and 6 deletions

View File

@ -162,9 +162,9 @@ def send_to_graph(results_server, results_link, title, date, browser_config, res
links = ''
for res in results:
filename = tempfile.mktemp()
tmpf = open(filename, "w")
browser_dump, counter_dump = results[res]
utils.debug("Working with test: " + res)
utils.debug("Sending results: " + " ".join(browser_dump))
filename = tempfile.mktemp()
tmpf = open(filename, "w")
if res in ('ts', 'twinopen'):
@ -305,6 +305,7 @@ def test_file(filename):
utils.stamped_msg("Failed " + test, "Stopped")
print 'FAIL: failure to complete test: ' + test
sys.exit(0)
utils.debug("Received test results: " + " ".join(browser_dump))
results[test] = [browser_dump, counter_dump]
utils.stamped_msg("Completed test " + test, "Stopped")
utils.stamped_msg(title, "Stopped")

View File

@ -170,26 +170,29 @@ def runTest(browser_config, test_config):
# Check to see if page load times were outputted
(bytes, current_output) = ffprocess.NonBlockingReadProcessOutput(handle)
output += current_output
match = RESULTS_GENERIC.search(current_output)
if match:
if match.group(1):
utils.noisy(match.group(1))
match = RESULTS_REGEX.search(output)
if match:
browser_results += match.group(1)
utils.debug("Matched basic results: " + browser_results)
res = 1
break
#TODO: this a stop gap until all of the tests start outputting the same format
match = RESULTS_TP_REGEX.search(output)
if match:
browser_results += match.group(1)
utils.debug("Matched tp results: " + browser_results)
res = 1
break
match = RESULTS_REGEX_FAIL.search(output)
if match:
browser_results += match.group(1)
utils.debug("Matched fail results: " + browser_results)
print "FAIL: " + match.group(1)
break
match = RESULTS_GENERIC.search(current_output)
if match:
if match.group(1) != '':
utils.noisy(match.group(1))
#ensure that the browser is still running
#check at intervals of 60 - this is just to cut down on load
@ -210,6 +213,7 @@ def runTest(browser_config, test_config):
#stop the counter manager since this test is complete
cm.stopMonitor()
utils.debug("Completed test with: " + browser_results)
#kill any remaining firefox processes
ffprocess.TerminateAllProcesses("firefox")
all_browser_results.append(browser_results)