commit 3a2e3d9f7b88344e69e8492caade313fb6c64bae
author Rob Mohr <mohrr@google.com> Tue Aug 13 05:11:47 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 13 05:11:47 2024 +0000
tree ef7ee284d46e7743521eae4f1a26b0176c88e93c
parent 4458845c7ef7796208757c10f92a1657196fabbe

submodule_roller: Reformat tests

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

recipes/submodule_roller.py

diff --git a/recipes/submodule_roller.py b/recipes/submodule_roller.py
index 0592300..1fb2d59 100644
--- a/recipes/submodule_roller.py
+++ b/recipes/submodule_roller.py
@@ -279,42 +279,43 @@
             **kwargs,
         )
 
-    yield (
-        api.test('success')
-        + properties(
+    yield api.test(
+        'success',
+        properties(
             submodules('a1', 'b2'),
             cc_authors_on_rolls=True,
             always_cc=True,
             forge_author=True,
-        )
-        + commit_data('a1', prefix='')
-        + commit_data('b2', prefix='')
-        + gitmodules(a1='sso://foo/a1', b2='sso://foo/b2')
-        + api.roll_util.forward_roll('a1')
-        + api.roll_util.forward_roll('b2')
-        + api.auto_roller.dry_run_success()
+        ),
+        commit_data('a1', prefix=''),
+        commit_data('b2', prefix=''),
+        gitmodules(a1='sso://foo/a1', b2='sso://foo/b2'),
+        api.roll_util.forward_roll('a1'),
+        api.roll_util.forward_roll('b2'),
+        api.auto_roller.dry_run_success(),
     )
 
-    yield (
-        api.test('partial_noop')
-        + properties(submodules('a1', 'b2'), cc_reviewers_on_rolls=True)
-        + commit_data('a1', prefix='')
-        + gitmodules(a1='sso://foo/a1', b2='sso://foo/b2')
-        + api.roll_util.forward_roll('a1')
-        + api.roll_util.noop_roll('b2')
-        + api.auto_roller.dry_run_success()
+    yield api.test(
+        'partial_noop',
+        properties(submodules('a1', 'b2'), cc_reviewers_on_rolls=True),
+        commit_data('a1', prefix=''),
+        gitmodules(a1='sso://foo/a1', b2='sso://foo/b2'),
+        api.roll_util.forward_roll('a1'),
+        api.roll_util.noop_roll('b2'),
+        api.auto_roller.dry_run_success(),
     )
 
-    yield (
-        api.test('noop')
-        + properties(submodules('a1', {'path': 'b2'}))
-        + gitmodules(a1='a1', b2='b2', b2_branch='branch')
-        + api.roll_util.noop_roll('a1')
-        + api.roll_util.noop_roll('b2')
+    yield api.test(
+        'noop',
+        properties(submodules('a1', {'path': 'b2'})),
+        gitmodules(a1='a1', b2='b2', b2_branch='branch'),
+        api.roll_util.noop_roll('a1'),
+        api.roll_util.noop_roll('b2'),
     )
 
-    yield (
-        api.test('missing', status='FAILURE')
-        + properties(submodules('a1', 'b2'), cc_authors_on_rolls=True)
-        + gitmodules(a1='sso://foo/a1')
+    yield api.test(
+        'missing',
+        properties(submodules('a1', 'b2'), cc_authors_on_rolls=True),
+        gitmodules(a1='sso://foo/a1'),
+        status='FAILURE',
     )