commit f62636a99f41839372371192a38b469f802b6647
author Rob Mohr <mohrr@google.com> Mon Aug 12 19:31:51 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 12 19:31:51 2024 +0000
tree 02bafaec0e36bff6b6be72335550a1fe46a4a360
parent c26d9de4f859328b845bfcc8d10fc1110d48d627

environment: Reformat tests

Change-Id: I0888fb8a9952ceb05342ad8d26d6cee113701fa6
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/228658
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Reviewed-by: Danielle Kay <danikay@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>

recipe_modules/environment/tests/full.py

diff --git a/recipe_modules/environment/tests/full.py b/recipe_modules/environment/tests/full.py
index e54b23d..ab1ed69 100644
--- a/recipe_modules/environment/tests/full.py
+++ b/recipe_modules/environment/tests/full.py
@@ -69,50 +69,51 @@
 def GenTests(api) -> Generator[recipe_test_api.TestData, None, None]:
     yield api.test('no-props')
 
-    yield (
-        api.test('normal')
-        + api.environment.properties(skip_submodule_check=True)
-        + api.properties(**{'$recipe_engine/led': {'led_run_id': '123'}})
-        + api.platform.name('mac')
+    yield api.test(
+        'normal',
+        api.environment.properties(skip_submodule_check=True),
+        api.properties(**{'$recipe_engine/led': {'led_run_id': '123'}}),
+        api.platform.name('mac'),
     )
 
-    yield (
-        api.test('doctor-fail', status='FAILURE')
-        + api.environment.properties(
+    yield api.test(
+        'doctor-fail',
+        api.environment.properties(
             skip_submodule_check=True,
             additional_cipd_files=('override.json',),
-        )
-        + api.platform.name('linux')
-        + api.step_data('environment.doctor', retcode=1)
+        ),
+        api.platform.name('linux'),
+        api.step_data('environment.doctor', retcode=1),
+        status='FAILURE',
     )
 
-    yield (
-        api.test('doctor-fail-allowed')
-        + api.environment.properties(
+    yield api.test(
+        'doctor-fail-allowed',
+        api.environment.properties(
             skip_submodule_check=True,
             additional_cipd_files=('override.json',),
             allow_doctor_to_fail=True,
-        )
-        + api.platform.name('linux')
-        + api.step_data('environment.doctor', retcode=1)
+        ),
+        api.platform.name('linux'),
+        api.step_data('environment.doctor', retcode=1),
     )
 
-    yield (
-        api.test('windows')
-        + api.environment.properties(additional_variables=dict(ABC=123))
-        + api.platform.name('win')
+    yield api.test(
+        'windows',
+        api.environment.properties(additional_variables=dict(ABC=123)),
+        api.platform.name('win'),
     )
 
-    yield (
-        api.test('override-cipd')
-        + api.environment.properties(skip_submodule_check=True)
-        + api.environment.override_clang(cipd_version='latest')
+    yield api.test(
+        'override-cipd',
+        api.environment.properties(skip_submodule_check=True),
+        api.environment.override_clang(cipd_version='latest'),
     )
 
-    yield (
-        api.test('override-cas')
-        + api.environment.properties(skip_submodule_check=True)
-        + api.environment.override_clang(cas_digest='123456')
+    yield api.test(
+        'override-cas',
+        api.environment.properties(skip_submodule_check=True),
+        api.environment.override_clang(cas_digest='123456'),
     )
 
     yield api.test('empty')