Modified: trunk/Tools/ChangeLog (147708 => 147709)
--- trunk/Tools/ChangeLog 2013-04-05 05:24:18 UTC (rev 147708)
+++ trunk/Tools/ChangeLog 2013-04-05 05:36:52 UTC (rev 147709)
@@ -1,3 +1,18 @@
+2013-04-04 Benjamin Poulain <[email protected]>
+
+ Temporarily disable the Python unittests broken by the commit queue not running layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=113997
+
+ Reviewed by Ryosuke Niwa.
+
+ Disable the tests until Ryosuke gets the time and hardware to have
+ a testing commit-queue.
+
+ * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+ (CommitQueueTaskTest):
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ (CommitQueueTest):
+
2013-04-04 Ryosuke Niwa <[email protected]>
Remove Chromium builders from build.webkit.org
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (147708 => 147709)
--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2013-04-05 05:24:18 UTC (rev 147708)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2013-04-05 05:36:52 UTC (rev 147709)
@@ -132,6 +132,7 @@
self.assertEqual(success, not expect_retry)
return task
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_success_case(self):
commit_queue = MockCommitQueue([])
expected_logs = """run_webkit_patch: ['clean']
@@ -270,6 +271,7 @@
"""
self._run_through_task(commit_queue, expected_logs, expect_retry=True)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_flaky_test_failure(self):
commit_queue = MockCommitQueue([
None,
@@ -303,6 +305,7 @@
"""
self._run_through_task(commit_queue, expected_logs)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_failed_archive(self):
commit_queue = MockCommitQueue([
None,
@@ -335,6 +338,7 @@
"""
self._run_through_task(commit_queue, expected_logs)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_double_flaky_test_failure(self):
commit_queue = FailingTestCommitQueue([
None,
@@ -374,6 +378,7 @@
success = OutputCapture().assert_outputs(self, task.run, expected_logs=expected_logs)
self.assertFalse(success)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_test_failure(self):
commit_queue = MockCommitQueue([
None,
@@ -405,6 +410,7 @@
"""
self._run_through_task(commit_queue, expected_logs, GoldenScriptError)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_red_test_failure(self):
commit_queue = FailingTestCommitQueue([
None,
@@ -446,6 +452,7 @@
"""
self._run_through_task(commit_queue, expected_logs)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_very_red_tree_retry(self):
lots_of_failing_tests = map(lambda num: "test-%s.html" % num, range(0, 100))
commit_queue = FailingTestCommitQueue([
@@ -487,6 +494,7 @@
"""
self._run_through_task(commit_queue, expected_logs, expect_retry=True)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_red_tree_patch_rejection(self):
commit_queue = FailingTestCommitQueue([
None,
@@ -529,6 +537,7 @@
# failure_status_id should be of the test with patch (1), not the test without patch (2).
self.assertEqual(task.failure_status_id, 1)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_land_failure(self):
commit_queue = MockCommitQueue([
None,
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (147708 => 147709)
--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2013-04-05 05:24:18 UTC (rev 147708)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2013-04-05 05:36:52 UTC (rev 147709)
@@ -28,6 +28,7 @@
import os
import StringIO
+import unittest
from webkitpy.common.checkout.scm import CheckoutNeedsUpdate
from webkitpy.common.checkout.scm.scm_mock import MockSCM
@@ -232,6 +233,7 @@
def _mock_test_result(self, testname):
return test_results.TestResult(testname, [test_failures.FailureTextMismatch()])
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_commit_queue(self):
tool = MockTool()
tool.filesystem.write_text_file('/tmp/layout-test-results/full_results.json', '') # Otherwise the commit-queue will hit a KeyError trying to read the results from the MockFileSystem.
@@ -315,6 +317,7 @@
queue.run_webkit_patch = mock_run_webkit_patch
self.assert_queue_outputs(queue, expected_logs=expected_logs)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_rollout(self):
tool = MockTool()
tool.filesystem.write_text_file('/tmp/layout-test-results/full_results.json', '') # Otherwise the commit-queue will hit a KeyError trying to read the results from the MockFileSystem.
@@ -386,6 +389,7 @@
self.assertFalse(options.build)
self.assertFalse(options.test)
+ @unittest.skip("Commit queue testing temporarily disabled.")
def test_manual_reject_during_processing(self):
queue = SecondThoughtsCommitQueue(MockTool())
queue.begin_work_queue()
