checkout: Reformat tests
Change-Id: I0474a9815280e97679573957f68b4c9bba3a4ef6
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/229393
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Danielle Kay <danikay@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
diff --git a/recipe_modules/checkout/tests/git.py b/recipe_modules/checkout/tests/git.py
index c54de47..5dfc7dd 100644
--- a/recipe_modules/checkout/tests/git.py
+++ b/recipe_modules/checkout/tests/git.py
@@ -62,13 +62,17 @@
)
return api.properties(props)
- yield api.test('ci') + properties() + api.checkout.ci_test_data()
+ yield api.test(
+ 'ci',
+ properties(),
+ api.checkout.ci_test_data(),
+ )
- yield (
- api.test('trigger')
- + properties()
- + api.checkout.ci_test_data()
- + api.scheduler(
+ yield api.test(
+ 'trigger',
+ properties(),
+ api.checkout.ci_test_data(),
+ api.scheduler(
triggers=[
triggers_pb2.Trigger(
gitiles=triggers_pb2.GitilesTrigger(
@@ -78,29 +82,33 @@
),
),
],
- )
+ ),
)
- yield (
- api.test('try')
- + properties(root_subdirectory='foo')
- + api.checkout.try_test_data()
- + api.checkout.cl_branch_parents(num_parents=2)
+ yield api.test(
+ 'try',
+ properties(root_subdirectory='foo'),
+ api.checkout.try_test_data(),
+ api.checkout.cl_branch_parents(num_parents=2),
)
- yield api.test('other') + properties()
+ yield api.test(
+ 'other',
+ properties(),
+ )
- yield (
- api.test('not_in_gerrit')
- + properties()
- + api.step_data(
+ yield api.test(
+ 'not_in_gerrit',
+ properties(),
+ api.step_data(
'checkout pigweed.change data.number',
api.json.output({}),
- )
+ ),
)
- yield (
- api.test('fail-config', status='INFRA_FAILURE')
- + properties()
- + api.step_data('checkout pigweed.cache.git fetch', retcode=1)
+ yield api.test(
+ 'fail-config',
+ properties(),
+ api.step_data('checkout pigweed.cache.git fetch', retcode=1),
+ status='INFRA_FAILURE',
)
diff --git a/recipe_modules/checkout/tests/repo.py b/recipe_modules/checkout/tests/repo.py
index 53e29a5..972a35f 100644
--- a/recipe_modules/checkout/tests/repo.py
+++ b/recipe_modules/checkout/tests/repo.py
@@ -67,222 +67,224 @@
patchset=patchset,
)
- yield (
- api.test('ci')
- + properties()
- + api.checkout.manifest_test_data()
- + api.checkout.root_files('foo', 'bar', '.repo')
+ yield api.test(
+ 'ci',
+ properties(),
+ api.checkout.manifest_test_data(),
+ api.checkout.root_files('foo', 'bar', '.repo'),
)
- yield (
- api.test('try')
- + properties(manifest_groups=['group1'])
- + api.checkout.try_test_data(PIGWEED_REPO)
- + api.checkout.manifest_test_data()
- + api.checkout.root_files('foo', '.repo')
- + api.checkout.all_changes_applied()
- + api.post_process(
+ yield api.test(
+ 'try',
+ properties(manifest_groups=['group1']),
+ api.checkout.try_test_data(PIGWEED_REPO),
+ api.checkout.manifest_test_data(),
+ api.checkout.root_files('foo', '.repo'),
+ api.checkout.all_changes_applied(),
+ api.post_process(
post_process.MustRun,
'checkout pigweed.no non-standard branch names',
- )
+ ),
)
- yield (
- api.test('try-multiple')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'try-multiple',
+ properties(),
+ api.checkout.try_test_data(
gerrit_changes=[
cl('pigweed_name', 1234),
cl('default_name', 2345, name='default'),
]
- )
- + api.checkout.manifest_test_data()
- + api.checkout.root_files('foo', '.repo')
- + api.checkout.all_changes_applied()
- + api.checkout.change_applied('pigweed:1234')
- + api.checkout.change_applied('default:2345')
+ ),
+ api.checkout.manifest_test_data(),
+ api.checkout.root_files('foo', '.repo'),
+ api.checkout.all_changes_applied(),
+ api.checkout.change_applied('pigweed:1234'),
+ api.checkout.change_applied('default:2345'),
)
- yield (
- api.test('try-multiple-cqdeps')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'try-multiple-cqdeps',
+ properties(),
+ api.checkout.try_test_data(
git_repo='https://pigweed.googlesource.com/pigweed_name',
change_number=1234,
patch_set=1,
- )
- + api.cq_deps.details(
+ ),
+ api.cq_deps.details(
'pigweed:1234',
patches_json=True,
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.patches_json(
+ ),
+ api.cq_deps.patches_json(
'pigweed:1234',
'default:2345',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.details(
+ ),
+ api.cq_deps.details(
'default:2345',
project='default_name',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.checkout.manifest_test_data()
- + api.checkout.root_files('foo', '.repo')
- + api.checkout.all_changes_applied()
- + api.checkout.change_applied('pigweed:1234')
- + api.checkout.change_applied('default:2345')
+ ),
+ api.checkout.manifest_test_data(),
+ api.checkout.root_files('foo', '.repo'),
+ api.checkout.all_changes_applied(),
+ api.checkout.change_applied('pigweed:1234'),
+ api.checkout.change_applied('default:2345'),
)
- yield (
- api.test('try-multiple-onenotapplied')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'try-multiple-onenotapplied',
+ properties(),
+ api.checkout.try_test_data(
gerrit_changes=[
cl('pigweed_name', 1234),
cl('default_name', 2345, name='default'),
cl('project-that-is-not-in-the-manifest', 3456),
]
- )
- + api.checkout.manifest_test_data(name='pigweed')
- + api.checkout.root_files('foo', '.repo')
- + api.checkout.some_changes_applied()
- + api.checkout.change_not_applied('pigweed:3456')
+ ),
+ api.checkout.manifest_test_data(name='pigweed'),
+ api.checkout.root_files('foo', '.repo'),
+ api.checkout.some_changes_applied(),
+ api.checkout.change_not_applied('pigweed:3456'),
)
- yield (
- api.test('try_repo_not_in_manifest', status='INFRA_FAILURE')
- + properties()
- + api.checkout.try_test_data('https://foo.googlesource.com/bar')
- + api.checkout.manifest_test_data()
- + api.checkout.no_changes_applied()
+ yield api.test(
+ 'try_repo_not_in_manifest',
+ properties(),
+ api.checkout.try_test_data('https://foo.googlesource.com/bar'),
+ api.checkout.manifest_test_data(),
+ api.checkout.no_changes_applied(),
+ status='INFRA_FAILURE',
)
- yield (
- api.test('try_manifest')
- + properties()
- + api.checkout.try_test_data(api.checkout.manifest_repo)
- + api.checkout.cl_branch_parents(
+ yield api.test(
+ 'try_manifest',
+ properties(),
+ api.checkout.try_test_data(api.checkout.manifest_repo),
+ api.checkout.cl_branch_parents(
'feature-not-in-manifest',
remote=api.checkout.manifest_repo,
- )
- + api.checkout.manifest_test_data()
- + api.checkout.root_files('foo')
- + api.checkout.all_changes_applied()
+ ),
+ api.checkout.manifest_test_data(),
+ api.checkout.root_files('foo'),
+ api.checkout.all_changes_applied(),
)
- yield (
- api.test('feature_branches_try')
- + properties()
- + api.checkout.try_test_data(PIGWEED_REPO)
- + api.checkout.cl_branch_parents(
+ yield api.test(
+ 'feature_branches_try',
+ properties(),
+ api.checkout.try_test_data(PIGWEED_REPO),
+ api.checkout.cl_branch_parents(
branch='feature1', remote=PIGWEED_REPO, name='pigweed'
- )
- + api.checkout.manifest_has_matching_branch('feature1')
- + api.checkout.manifest_test_data()
- + api.checkout.all_changes_applied()
+ ),
+ api.checkout.manifest_has_matching_branch('feature1'),
+ api.checkout.manifest_test_data(),
+ api.checkout.all_changes_applied(),
)
- yield (
- api.test('feature_branches_try_multiple_features')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'feature_branches_try_multiple_features',
+ properties(),
+ api.checkout.try_test_data(
gerrit_changes=[
cl('pigweed_name', 1234),
cl('default_name', 2345, name='default'),
]
- )
- + api.checkout.cl_branch_parents(
+ ),
+ api.checkout.cl_branch_parents(
'feature1',
index=0,
project='pigweed_name',
name='pigweed',
- )
- + api.checkout.cl_branch_parents(
+ ),
+ api.checkout.cl_branch_parents(
'feature2',
index=1,
project='default_name',
name='pigweed',
- )
- + api.checkout.manifest_has_matching_branch('feature1')
- + api.checkout.manifest_test_data()
- + api.checkout.all_changes_applied()
- + api.post_process(
+ ),
+ api.checkout.manifest_has_matching_branch('feature1'),
+ api.checkout.manifest_test_data(),
+ api.checkout.all_changes_applied(),
+ api.post_process(
post_process.DoesNotRun,
'checkout pigweed.no non-standard branch names',
- )
- + api.post_process(
+ ),
+ api.post_process(
post_process.DoesNotRun,
'checkout pigweed.not matching branch names',
- )
+ ),
)
- yield (
- api.test('feature_branches_try_multiple_matches', status='FAILURE')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'feature_branches_try_multiple_matches',
+ properties(),
+ api.checkout.try_test_data(
gerrit_changes=[
cl('pigweed_name', 1234),
cl('default_name', 2345, name='default'),
]
- )
- + api.checkout.cl_branch_parents('feature1', index=0)
- + api.checkout.cl_branch_parents('feature2', index=1)
- + api.checkout.manifest_has_matching_branch('feature1')
- + api.checkout.manifest_has_matching_branch('feature2')
- + api.checkout.all_changes_applied()
- + api.post_process(
+ ),
+ api.checkout.cl_branch_parents('feature1', index=0),
+ api.checkout.cl_branch_parents('feature2', index=1),
+ api.checkout.manifest_has_matching_branch('feature1'),
+ api.checkout.manifest_has_matching_branch('feature2'),
+ api.checkout.all_changes_applied(),
+ api.post_process(
post_process.DoesNotRun,
'checkout pigweed.not matching branch names',
- )
+ ),
+ status='FAILURE',
)
- yield (
- api.test('feature_branches_try_no_matching')
- + properties(match_branch=False)
- + api.checkout.try_test_data(
+ yield api.test(
+ 'feature_branches_try_no_matching',
+ properties(match_branch=False),
+ api.checkout.try_test_data(
gerrit_changes=[
cl('pigweed_name', 1234),
cl('default_name', 2345, name='default'),
]
- )
- + api.checkout.cl_branch_parents(
+ ),
+ api.checkout.cl_branch_parents(
'feature1', index=0, remote=PIGWEED_REPO, name='pigweed'
- )
- + api.checkout.cl_branch_parents(
+ ),
+ api.checkout.cl_branch_parents(
'feature2', index=1, remote=DEFAULT_REPO, name='pigweed'
- )
- + api.checkout.manifest_test_data()
- + api.checkout.all_changes_applied()
- + api.post_process(
+ ),
+ api.checkout.manifest_test_data(),
+ api.checkout.all_changes_applied(),
+ api.post_process(
post_process.MustRun,
'checkout pigweed.not matching branch names',
- )
+ ),
)
- yield (
- api.test('feature_branches_ci')
- + properties()
- + api.checkout.ci_test_data(
+ yield api.test(
+ 'feature_branches_ci',
+ properties(),
+ api.checkout.ci_test_data(
'https://pigweed.googlesource.com/pinned',
branch='feature1',
name='pigweed',
- )
- + api.checkout.manifest_has_matching_branch('feature1')
- + api.checkout.manifest_test_data()
+ ),
+ api.checkout.manifest_has_matching_branch('feature1'),
+ api.checkout.manifest_test_data(),
)
- yield (
- api.test('no_trigger')
- + properties()
- + api.checkout.manifest_test_data()
+ yield api.test(
+ 'no_trigger',
+ properties(),
+ api.checkout.manifest_test_data(),
)
- yield (
- api.test('prefix')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'prefix',
+ properties(),
+ api.checkout.try_test_data(
"https://foo.googlesource.com/prefix/suffix"
- )
- + api.checkout.manifest_test_data()
- + api.checkout.all_changes_applied()
+ ),
+ api.checkout.manifest_test_data(),
+ api.checkout.all_changes_applied(),
)
diff --git a/recipe_modules/checkout/tests/submodule.py b/recipe_modules/checkout/tests/submodule.py
index 79c5621..23063d7 100644
--- a/recipe_modules/checkout/tests/submodule.py
+++ b/recipe_modules/checkout/tests/submodule.py
@@ -62,49 +62,51 @@
),
)
- yield (
- api.test('submodule-try')
- + properties()
- + api.checkout.try_test_data(git_repo='https://x.googlesource.com/baz')
- + submodule_data
- + api.checkout.all_changes_applied()
+ yield api.test(
+ 'submodule-try',
+ properties(),
+ api.checkout.try_test_data(git_repo='https://x.googlesource.com/baz'),
+ submodule_data,
+ api.checkout.all_changes_applied(),
)
- yield (
- api.test('submodule-ci')
- + properties()
- + api.checkout.ci_test_data(git_repo='https://x.googlesource.com/baz')
- + submodule_data
+ yield api.test(
+ 'submodule-ci',
+ properties(),
+ api.checkout.ci_test_data(git_repo='https://x.googlesource.com/baz'),
+ submodule_data,
)
- yield (
- api.test('submodule-not-initialized', status='INFRA_FAILURE')
- + properties()
- + api.checkout.ci_test_data(git_repo='https://x.googlesource.com/b/c/d')
- + submodule_data
+ yield api.test(
+ 'submodule-not-initialized',
+ properties(),
+ api.checkout.ci_test_data(git_repo='https://x.googlesource.com/b/c/d'),
+ submodule_data,
+ status='INFRA_FAILURE',
)
- yield (
- api.test('submodule-try-not-found', status='INFRA_FAILURE')
- + properties()
- + api.checkout.try_test_data(git_repo='https://x.googlesource.com/xyz')
- + submodule_data
- + api.checkout.no_changes_applied()
+ yield api.test(
+ 'submodule-try-not-found',
+ properties(),
+ api.checkout.try_test_data(git_repo='https://x.googlesource.com/xyz'),
+ submodule_data,
+ api.checkout.no_changes_applied(),
+ status='INFRA_FAILURE',
)
- yield (
- api.test('submodule-try-equivalent')
- + properties(
+ yield api.test(
+ 'submodule-try-equivalent',
+ properties(
equivalent_remotes=(
(
'https://z.googlesource.com/foo',
'https://x.googlesource.com/foo',
),
),
- )
- + api.checkout.try_test_data(git_repo='https://z.googlesource.com/foo')
- + submodule_data
- + api.checkout.all_changes_applied()
+ ),
+ api.checkout.try_test_data(git_repo='https://z.googlesource.com/foo'),
+ submodule_data,
+ api.checkout.all_changes_applied(),
)
def cl(project, change, patchset=1, name='pigweed'):
@@ -115,153 +117,155 @@
patchset=patchset,
)
- yield (
- api.test('submodule-try-multiple')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'submodule-try-multiple',
+ properties(),
+ api.checkout.try_test_data(
gerrit_changes=[
cl('foo', 1234, name='x'),
cl('bar', 2345, name='x'),
cl('pigweed/pigweed', 3456),
]
- )
- + submodule_data
- + api.checkout.all_changes_applied()
- + api.checkout.change_applied('x:1234')
- + api.checkout.change_applied('x:2345')
- + api.checkout.change_applied('pigweed:3456')
+ ),
+ submodule_data,
+ api.checkout.all_changes_applied(),
+ api.checkout.change_applied('x:1234'),
+ api.checkout.change_applied('x:2345'),
+ api.checkout.change_applied('pigweed:3456'),
)
- yield (
- api.test('submodule-try-multiple-one-missing')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'submodule-try-multiple-one-missing',
+ properties(),
+ api.checkout.try_test_data(
gerrit_changes=[
cl('foo', 1234, name='x'),
cl('not-a-submodule', 2345, name='x'),
cl('pigweed/pigweed', 3456),
]
- )
- + submodule_data
- + api.checkout.some_changes_applied()
- + api.checkout.change_applied('x:1234')
- + api.checkout.change_not_applied('x:2345')
- + api.checkout.change_applied('pigweed:3456')
+ ),
+ submodule_data,
+ api.checkout.some_changes_applied(),
+ api.checkout.change_applied('x:1234'),
+ api.checkout.change_not_applied('x:2345'),
+ api.checkout.change_applied('pigweed:3456'),
)
# These tests are nominally identical to 'submodule-try-multiple' and
# 'submodule-try-multiple-one-missing' above but use the cq_deps module.
# After the 'process gerrit changes' step all changes are minor (e.g.
# '2345' instead of '2345L').
- yield (
- api.test('submodule-try-multiple-cqdeps')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'submodule-try-multiple-cqdeps',
+ properties(),
+ api.checkout.try_test_data(
git_repo='https://x.googlesource.com/foo',
change_number=1234,
patch_set=1,
- )
- + api.cq_deps.details(
+ ),
+ api.cq_deps.details(
'x:1234',
patches_json=True,
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.patches_json(
+ ),
+ api.cq_deps.patches_json(
'x:1234',
'x:2345',
'pigweed:3456',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.details(
+ ),
+ api.cq_deps.details(
'x:2345',
project='bar',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.details(
+ ),
+ api.cq_deps.details(
'pigweed:3456',
project='pigweed/pigweed',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + submodule_data
- + api.checkout.all_changes_applied()
- + api.checkout.change_applied('x:1234')
- + api.checkout.change_applied('x:2345')
- + api.checkout.change_applied('pigweed:3456')
+ ),
+ submodule_data,
+ api.checkout.all_changes_applied(),
+ api.checkout.change_applied('x:1234'),
+ api.checkout.change_applied('x:2345'),
+ api.checkout.change_applied('pigweed:3456'),
)
- yield (
- api.test('submodule-try-multiple-one-missing-one-forbidden-cqdeps')
- + properties()
- + api.checkout.try_test_data(
+ yield api.test(
+ 'submodule-try-multiple-one-missing-one-forbidden-cqdeps',
+ properties(),
+ api.checkout.try_test_data(
git_repo='https://x.googlesource.com/foo',
change_number=1234,
patch_set=1,
- )
- + api.cq_deps.details(
+ ),
+ api.cq_deps.details(
'x:1234',
patches_json=True,
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.patches_json(
+ ),
+ api.cq_deps.patches_json(
'x:1234',
'x:2345',
'pigweed:3456',
'forbidden:9999',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.details(
+ ),
+ api.cq_deps.details(
'x:2345',
project='not-a-submodule',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.details(
+ ),
+ api.cq_deps.details(
'pigweed:3456',
project='pigweed/pigweed',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + api.cq_deps.forbidden(
+ ),
+ api.cq_deps.forbidden(
'forbidden:9999',
prefix='checkout pigweed.change data.process gerrit changes.',
- )
- + submodule_data
- + api.checkout.some_changes_applied()
- + api.checkout.change_applied('x:1234')
- + api.checkout.change_not_applied('x:2345')
- + api.checkout.change_not_applied('forbidden:9999')
- + api.checkout.change_applied('pigweed:3456')
+ ),
+ submodule_data,
+ api.checkout.some_changes_applied(),
+ api.checkout.change_applied('x:1234'),
+ api.checkout.change_not_applied('x:2345'),
+ api.checkout.change_not_applied('forbidden:9999'),
+ api.checkout.change_applied('pigweed:3456'),
)
- yield (
- api.test('submodule-try-included-excluded', status='INFRA_FAILURE')
- + properties(included_submodules=['foo'], excluded_submodules=['bar'])
- + api.checkout.ci_test_data()
+ yield api.test(
+ 'submodule-try-included-excluded',
+ properties(included_submodules=['foo'], excluded_submodules=['bar']),
+ api.checkout.ci_test_data(),
+ status='INFRA_FAILURE',
)
- yield (
- api.test('submodule-try-included')
- + properties(included_submodules=['nanopb'])
- + api.checkout.ci_test_data()
- + api.checkout.included_submodule('nanopb')
+ yield api.test(
+ 'submodule-try-included',
+ properties(included_submodules=['nanopb']),
+ api.checkout.ci_test_data(),
+ api.checkout.included_submodule('nanopb'),
)
- yield (
- api.test('submodule-try-excluded')
- + properties(excluded_submodules=['nanopb'])
- + api.checkout.ci_test_data()
- + api.checkout.excluded_submodule('nanopb')
+ yield api.test(
+ 'submodule-try-excluded',
+ properties(excluded_submodules=['nanopb']),
+ api.checkout.ci_test_data(),
+ api.checkout.excluded_submodule('nanopb'),
)
- yield (
- api.test('submodule-try-excluded-missing', status='INFRA_FAILURE')
- + properties(excluded_submodules=['missing'])
- + api.checkout.ci_test_data()
+ yield api.test(
+ 'submodule-try-excluded-missing',
+ properties(excluded_submodules=['missing']),
+ api.checkout.ci_test_data(),
+ status='INFRA_FAILURE',
)
- yield (
- api.test('submodule-repeated-nomatch', status='FAILURE')
- + properties()
- + api.checkout.try_test_data('https://x.googlesource.com/foo')
- + api.checkout.submodules(
+ yield api.test(
+ 'submodule-repeated-nomatch',
+ properties(),
+ api.checkout.try_test_data('https://x.googlesource.com/foo'),
+ api.checkout.submodules(
api.checkout.submodule(
'foo1',
'https://x.googlesource.com/foo',
@@ -272,14 +276,15 @@
'https://x.googlesource.com/foo',
branch='dev',
),
- )
+ ),
+ status='FAILURE',
)
- yield (
- api.test('submodule-repeated-match')
- + properties()
- + api.checkout.try_test_data('https://x.googlesource.com/foo')
- + api.checkout.submodules(
+ yield api.test(
+ 'submodule-repeated-match',
+ properties(),
+ api.checkout.try_test_data('https://x.googlesource.com/foo'),
+ api.checkout.submodules(
api.checkout.submodule(
'foo1',
'https://x.googlesource.com/foo',
@@ -290,14 +295,14 @@
'https://x.googlesource.com/foo',
branch='dev',
),
- )
+ ),
)
- yield (
- api.test('submodule-repeated-twomatch', status='FAILURE')
- + properties()
- + api.checkout.try_test_data('https://x.googlesource.com/foo')
- + api.checkout.submodules(
+ yield api.test(
+ 'submodule-repeated-twomatch',
+ properties(),
+ api.checkout.try_test_data('https://x.googlesource.com/foo'),
+ api.checkout.submodules(
api.checkout.submodule(
'foo1',
'https://x.googlesource.com/foo',
@@ -308,17 +313,18 @@
'https://x.googlesource.com/foo',
branch='main',
),
- )
+ ),
+ status='FAILURE',
)
- yield (
- api.test('insteadof')
- + properties(
+ yield api.test(
+ 'insteadof',
+ properties(
rewrites=[('https://github.com/foo', 'https://github.mirror/foo')],
- )
- + api.checkout.try_test_data()
- + api.checkout.submodules(
+ ),
+ api.checkout.try_test_data(),
+ api.checkout.submodules(
api.checkout.submodule('foobar', 'https://github.com/foo/bar', ' '),
- )
- + api.checkout.all_changes_applied()
+ ),
+ api.checkout.all_changes_applied(),
)
