Modified: trunk/Tools/ChangeLog (174181 => 174182)
--- trunk/Tools/ChangeLog 2014-10-01 22:43:56 UTC (rev 174181)
+++ trunk/Tools/ChangeLog 2014-10-01 22:46:39 UTC (rev 174182)
@@ -1,5 +1,19 @@
2014-10-01 Jake Nielsen <jacob_niel...@apple.com>
+ commitqueuetasks_unittest references a non-existent member variable
+ when mock-reporting flaky tests.
+ https://bugs.webkit.org/show_bug.cgi?id=137303
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+ (MockCommitQueue.report_flaky_tests):
+ Makes the appropriate name change.
+ (test_simple_flaky_test_failure):
+ Adds a unit test to make sure that the code is excercised.
+
+2014-10-01 Jake Nielsen <jacob_niel...@apple.com>
+
EWS is inconclusively spinning forever on a patch that breaks 500+
tests
https://bugs.webkit.org/show_bug.cgi?id=137223
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (174181 => 174182)
--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2014-10-01 22:43:56 UTC (rev 174181)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2014-10-01 22:46:39 UTC (rev 174182)
@@ -76,7 +76,7 @@
return LayoutTestResults(test_results=[], did_exceed_test_failure_limit=True)
def report_flaky_tests(self, patch, flaky_results, results_archive):
- flaky_tests = [result.filename for result in flaky_results]
+ flaky_tests = [result.test_name for result in flaky_results]
_log.info("report_flaky_tests: patch='%s' flaky_tests='%s' archive='%s'" % (patch.id(), flaky_tests, results_archive.filename))
def archive_last_test_results(self, patch):
@@ -335,6 +335,48 @@
"""
self._run_through_task(commit_queue, expected_logs)
+ def test_simple_flaky_test_failure(self):
+ commit_queue = FailingTestCommitQueue([
+ None,
+ None,
+ None,
+ None,
+ None,
+ ScriptError("MOCK test failure"),
+ None,
+ ], [
+ ["foo.html"],
+ [],
+ [],
+ ])
+
+ self.maxDiff = None
+
+ expected_logs = """run_webkit_patch: ['clean']
+command_passed: success_message='Cleaned working directory' patch='10000'
+run_webkit_patch: ['update']
+command_passed: success_message='Updated working directory' patch='10000'
+run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]
+command_passed: success_message='Applied patch' patch='10000'
+run_webkit_patch: ['validate-changelog', '--check-oops', '--non-interactive', 10000]
+command_passed: success_message='ChangeLog validated' patch='10000'
+run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']
+command_passed: success_message='Built patch' patch='10000'
+run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
+command_failed: failure_message='Patch does not pass tests' script_error='MOCK test failure' patch='10000'
+archive_last_test_results: patch='10000'
+run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']
+command_passed: success_message='Passed tests' patch='10000'
+report_flaky_tests: patch='10000' flaky_tests='['foo.html']' archive='mock-archive-10000.zip'
+run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]
+command_passed: success_message='Landed patch' patch='10000'
+"""
+ tool = MockTool(log_executive=True)
+ patch = tool.bugs.fetch_attachment(10000)
+ task = CommitQueueTask(commit_queue, patch)
+ success = OutputCapture().assert_outputs(self, task.run, expected_logs=expected_logs)
+ self.assertTrue(success)
+
def test_double_flaky_test_failure(self):
commit_queue = FailingTestCommitQueue([
None,
