[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9b960bb87c33011938ca71c3cfa47c8b15ef7444
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 21:43:33 2010 +0000

    2010-12-24  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r74632.
            http://trac.webkit.org/changeset/74632
            https://bugs.webkit.org/show_bug.cgi?id=51600
    
            makes test-webkitpy hang forever on GTK (Requested by philn-tp
            on #webkit).
    
            * Scripts/webkitpy/layout_tests/layout_package/message_broker.py:
            * Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74655 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c6630b8..2b95b68 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-24  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r74632.
+        http://trac.webkit.org/changeset/74632
+        https://bugs.webkit.org/show_bug.cgi?id=51600
+
+        makes test-webkitpy hang forever on GTK (Requested by philn-tp
+        on #webkit).
+
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker.py:
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py:
+
 2010-12-24  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker.py
index 7f62e39..e0ca8db 100644
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker.py
@@ -137,7 +137,6 @@ class MultiThreadedBroker(WorkerMessageBroker):
 
     def run_message_loop(self):
         threads = self._threads()
-        wedged_threads = set()
 
         # Loop through all the threads waiting for them to finish.
         some_thread_is_alive = True
@@ -154,24 +153,17 @@ class MultiThreadedBroker(WorkerMessageBroker):
                     raise exception_info[0], exception_info[1], exception_info[2]
 
                 if thread.isAlive():
-                    if thread in wedged_threads:
-                        continue
-
                     some_thread_is_alive = True
                     next_timeout = thread.next_timeout()
                     if next_timeout and t > next_timeout:
                         log_wedged_worker(thread.getName(), thread.id())
                         thread.clear_next_timeout()
-                        wedged_threads.add(thread)
 
             self._test_runner.update()
 
             if some_thread_is_alive:
                 time.sleep(0.01)
 
-        if wedged_threads:
-            _log.warning("All remaining threads are wedged, bailing out.")
-
     def cancel_workers(self):
         threads = self._threads()
         for thread in threads:
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 b3941a3..6f04fd3 100644
--- 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,6 +84,7 @@ class TestThread(threading.Thread):
 
     def next_timeout(self):
         if self._timeout:
+            self._timeout_queue.put('done')
             return time.time() - 10
         return time.time()
 
@@ -143,6 +144,8 @@ class MultiThreadedBrokerTest(unittest.TestCase):
     def test_exception(self):
         self.assertRaises(ValueError, self.run_one_thread, 'Exception')
 
+
+class Test(unittest.TestCase):
     def test_find_thread_stack_found(self):
         id, stack = sys._current_frames().items()[0]
         found_stack = message_broker._find_thread_stack(id)
@@ -166,19 +169,9 @@ class MultiThreadedBrokerTest(unittest.TestCase):
         child_thread.start()
         msg = starting_queue.get()
 
-        # FIXME: this is an ugly hack to make the broker aware of the thread.
-        port = None
-        options = mocktool.MockOptions(child_processes='1')
-        runner = self.MockTestRunner()
-        broker = message_broker.MultiThreadedBroker(port, options)
-        worker = message_broker._WorkerState('worker-0')
-        worker.thread = child_thread
-        broker._test_runner = runner
-        broker._workers['worker-0'] = worker
-
-        stopping_queue.put('Timeout')
-        broker.run_message_loop()
-        child_thread._timeout_queue.put('done')
+        message_broker.log_wedged_worker(child_thread.getName(),
+                                         child_thread.id())
+        stopping_queue.put('')
         child_thread.join(timeout=1.0)
 
         self.assertFalse(astream.empty())

-- 
WebKit Debian packaging