Changeset 246862 in webkit

Timestamp:

Jun 26, 2019 5:36:51 PM (5 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-build] Add check for duplicate workers in config.json
​https://bugs.webkit.org/show_bug.cgi?id=199240

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/loadConfig.py:

(checkWorkersAndBuildersForConsistency._find_worker_with_name): Check for duplicate worker entry.

• BuildSlaveSupport/ews-build/loadConfig_unittest.py:

(TestcheckWorkersAndBuildersForConsistency.test_duplicate_worker): Added unit-test.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/loadConfig.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/loadConfig_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py

@@ -151 +151 @@
 def checkWorkersAndBuildersForConsistency(config, workers, builders):
     def _find_worker_with_name(workers, worker_name):
+        result = None
         for worker in workers:
             if worker['name'] == worker_name:
-                return worker
-        return None
+                if not result:
+                    result = worker
+                else:
+                    raise Exception('Duplicate worker entry found for {}.'.format(worker['name']))
+        return result
 
     for worker in workers:

trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py

@@ -165 +165 @@
         self.assertEqual(context.exception.args, ('Builder macOS-High-Sierra-WK2-EWS is for platform mac-sierra, but has worker ews102 for platform ios-11!',))
 
+    def test_duplicate_worker(self):
+        with self.assertRaises(Exception) as context:
+            loadConfig.checkWorkersAndBuildersForConsistency({}, [self.ews101, self.ews101], [self.WK2Builder])
+        self.assertEqual(context.exception.args, ('Duplicate worker entry found for ews101.',))
+
     def test_success(self):
         loadConfig.checkWorkersAndBuildersForConsistency({}, [self.ews101, {'name': 'ews102', 'platform': 'mac-sierra'}], [self.WK2Builder])

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-26  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Add check for duplicate workers in config.json
+        https://bugs.webkit.org/show_bug.cgi?id=199240
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/loadConfig.py:
+        (checkWorkersAndBuildersForConsistency._find_worker_with_name): Check for duplicate worker entry.
+        * BuildSlaveSupport/ews-build/loadConfig_unittest.py:
+        (TestcheckWorkersAndBuildersForConsistency.test_duplicate_worker): Added unit-test.
+
 2019-06-26  Ross Kirsling  <ross.kirsling@sony.com>