commit 247e6a2fefa4d7da629f449c99994af9d190c0cc
author Greg Edelston <gredelston@google.com> Mon Oct 19 11:30:08 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Mon Oct 19 22:06:57 2020 +0000
tree 57fc12e7857f40e4e1d29d2bc4d2b515a733ddae
parent cc551c82e88a60fd3fceb46a63f3f675ea3823ce

FAFT: PlatformNamesTestCase: Skip CONSOLIDATED

https://crrev.com/c/2468407 creates a script to generate a new JSON
config file in the fw-testing-configs repo, named CONSOLIDATED.json.
This file is structured differently than the platform-specific files in
the same repo. Notably, it does not have an attribute named 'platform'.

Currently, config_unittest.py's PlatformNamesTestCase requires all
config files in the fw-testing-configs repo, besides DEFAULTS.json, to
have an attribute "platform", whose value matches the platform name.
This CL updates PlatformNamesTestCase to skip that assertion for
CONSOLIDATED.json.

BUG=b:167424334
TEST=config_unittest.py while fw-testing-configs has CONSOLIDATED.json

Change-Id: I483d673cc8193ed4ddbfa3276363f064daedf78e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2485913
Tested-by: Greg Edelston <gredelston@google.com>
Reviewed-by: Kevin Shelton <kmshelton@chromium.org>
Commit-Queue: Greg Edelston <gredelston@google.com>

server/cros/faft/utils/config_unittest.py

diff --git a/server/cros/faft/utils/config_unittest.py b/server/cros/faft/utils/config_unittest.py
index 07be555..ba35c6e 100755
--- a/server/cros/faft/utils/config_unittest.py
+++ b/server/cros/faft/utils/config_unittest.py
@@ -179,14 +179,14 @@
 
     def runTest(self):
         """
-        For each JSON config file (except DEFAULTS), verify that there is an
+        For each platform JSON config file, verify that there is an
         attribute 'platform' whose value exactly matches the file's basename.
         For example, rambi.json should contain {'platform': 'rambi'}
         """
         for filename in os.listdir(config._CONFIG_DIR):
             filepath = os.path.join(config._CONFIG_DIR, filename)
             platform_name, ext = os.path.splitext(filename)
-            if ext != '.json' or platform_name == 'DEFAULTS':
+            if ext != '.json' or platform_name in ('DEFAULTS', 'CONSOLIDATED'):
                 continue
             with open(filepath) as f:
                 d = json.load(f)