Attachment 372961 Details for Bug 199240 – Patch

[patch] Patch

bug-199240-20190626190152.patch (text/plain), 2.76 KB, created by Aakash Jain on 2019-06-26 16:01:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2019-06-26 16:01:53 PDT

Size: 2.76 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246850)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+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 NOBODY (OOPS!).
>+
>+        * 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>
> 
>         [Win][MiniBrowser] Remove obsolete code after r246814.
>Index: Tools/BuildSlaveSupport/ews-build/loadConfig.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/loadConfig.py	(revision 246850)
>+++ Tools/BuildSlaveSupport/ews-build/loadConfig.py	(working copy)
>@@ -150,10 +150,14 @@ def isTriggerUsedByAnyBuilder(config, tr
> 
> 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:
>         checkValidWorker(worker)
>Index: Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py	(revision 246850)
>+++ Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py	(working copy)
>@@ -164,6 +164,11 @@ class TestcheckWorkersAndBuildersForCons
>             loadConfig.checkWorkersAndBuildersForConsistency({}, [self.ews101, self.ews102], [self.WK2Builder])
>         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])
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199240: 372961