2011-02-03 Dirk Pranke <dpranke@chromium.org>

        Unreviewed, build fix.

        Delete a line that was accidentally missed in r77586; without it
        there is still a race between the two threads.

        https://bugs.webkit.org/show_bug.cgi?id=51572

        * Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f7dbc755fb22ab34e803eae6978f696fb487f7a4..9be7f1de613c2e8cd5652d605da16b2453996d49 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-03  Dirk Pranke  <dpranke@chromium.org>
+
+        Unreviewed, build fix.
+
+        Delete a line that was accidentally missed in r77586; without it
+        there is still a race between the two threads.
+
+        https://bugs.webkit.org/show_bug.cgi?id=51572
+
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py:
+
 2011-02-03  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Tony Chang.

diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py
index 75ce40b25cd67da9e135732d0a2514dbb3bf57bf..ae21563ef03e5ef26a038abc75673b7d155decd0 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py
@@ -84,7 +84,6 @@ class TestThread(threading.Thread):
 
     def next_timeout(self):
         if self._timeout:
-            self._timeout_queue.put('done')
             return time.time() - 10
         return time.time()