Changeset 90651 in webkit

Timestamp:

Jul 8, 2011 12:21:41 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

REGRESSION(90419) NRWT's httpd locking is broken for --child-processes=1
​https://bugs.webkit.org/show_bug.cgi?id=64092

Reviewed by Tony Chang.

The code was incorrectly creating empty shards in the
shard_in_two case.

• Scripts/webkitpy/layout_tests/controllers/manager.py:
• Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/manager_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-08  Dirk Pranke  <dpranke@chromium.org>
+
+        REGRESSION(90419) NRWT's httpd locking is broken for --child-processes=1
+        https://bugs.webkit.org/show_bug.cgi?id=64092
+
+        Reviewed by Tony Chang.
+
+        The code was incorrectly creating empty shards in the
+        shard_in_two case.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        * Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
+
 2011-07-08  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -570 +570 @@
             else:
                 unlocked_inputs.append(test_input)
-        return [TestShard('locked_tests', locked_inputs)], [TestShard('unlocked_tests', unlocked_inputs)]
+
+        locked_shards = []
+        unlocked_shards = []
+        if locked_inputs:
+            locked_shards = [TestShard('locked_tests', locked_inputs)]
+        if unlocked_inputs:
+            unlocked_shards = [TestShard('unlocked_tests', unlocked_inputs)]
+
+        return locked_shards, unlocked_shards
 
     def _shard_every_file(self, test_files):

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py

@@ -68 +68 @@
     ]
 
-    def get_shards(self, num_workers, fully_parallel):
+    def get_shards(self, num_workers, fully_parallel, test_list=None):
+        test_list = test_list or self.test_list
         port = layout_tests.port.get(port_name='test')
         port._filesystem = filesystem_mock.MockFileSystem()
         self.manager = ManagerWrapper(port=port, options=Mock(), printer=Mock())
-        return self.manager._shard_tests(self.test_list, num_workers, fully_parallel)
+        return self.manager._shard_tests(test_list, num_workers, fully_parallel)
 
     def test_shard_by_dir(self):
@@ -127 +128 @@
                         'dom/html/level2/html/HTMLAnchorElement06.html'])])
 
+    def test_shard_in_two_has_no_locked_shards(self):
+        locked, unlocked = self.get_shards(num_workers=1, fully_parallel=False,
+             test_list=['animations/keyframe.html'])
+        self.assertEquals(len(locked), 0)
+        self.assertEquals(len(unlocked), 1)
+
+    def test_shard_in_two_has_no_unlocked_shards(self):
+        locked, unlocked = self.get_shards(num_workers=1, fully_parallel=False,
+             test_list=['http/tests/webcoket/tests/unicode.htm'])
+        self.assertEquals(len(locked), 1)
+        self.assertEquals(len(unlocked), 0)
+
 
 class ManagerTest(unittest.TestCase):