cq_deps: Support topics with spaces
Also, make info-only steps a little clearer.
Bug: b/332610044
Change-Id: I5d919005a84dbcba24469bf4ba25fd2d14e43a65
Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/201691
Reviewed-by: Donna Albee <albeed@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
diff --git a/recipe_modules/checkout/tests/git.expected/try.json b/recipe_modules/checkout/tests/git.expected/try.json
index 3198080..8ce1c13 100644
--- a/recipe_modules/checkout/tests/git.expected/try.json
+++ b/recipe_modules/checkout/tests/git.expected/try.json
@@ -303,7 +303,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
index b734876..905b078 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
index 2d59dc8..0175539 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_features.json
@@ -368,7 +368,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
index d37b66c..a7d350b 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_multiple_matches.json
@@ -367,7 +367,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
index f748ec5..7a1db35 100644
--- a/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
+++ b/recipe_modules/checkout/tests/repo.expected/feature_branches_try_no_matching.json
@@ -368,7 +368,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/prefix.json b/recipe_modules/checkout/tests/repo.expected/prefix.json
index 9d2df0c..8684076 100644
--- a/recipe_modules/checkout/tests/repo.expected/prefix.json
+++ b/recipe_modules/checkout/tests/repo.expected/prefix.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
index a0ded45..25a80e2 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-cqdeps.json
@@ -539,7 +539,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
index 90d123f..cf7baf6 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple-onenotapplied.json
@@ -435,7 +435,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/try-multiple.json b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
index d99f097..f402074 100644
--- a/recipe_modules/checkout/tests/repo.expected/try-multiple.json
+++ b/recipe_modules/checkout/tests/repo.expected/try-multiple.json
@@ -368,7 +368,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/try.json b/recipe_modules/checkout/tests/repo.expected/try.json
index 3ba6347..4df7206 100644
--- a/recipe_modules/checkout/tests/repo.expected/try.json
+++ b/recipe_modules/checkout/tests/repo.expected/try.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/try_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
index 5904401..927031a 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_manifest.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json b/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
index 0df2363..062d319 100644
--- a/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
+++ b/recipe_modules/checkout/tests/repo.expected/try_repo_not_in_manifest.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/insteadof.json b/recipe_modules/checkout/tests/submodule.expected/insteadof.json
index ba26f9b..2e79486 100644
--- a/recipe_modules/checkout/tests/submodule.expected/insteadof.json
+++ b/recipe_modules/checkout/tests/submodule.expected/insteadof.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
index 205c9ca..1eabfb2 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-match.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
index 4157581..c76ef3c 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-nomatch.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
index 0f2492d..072085d 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-repeated-twomatch.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
index 2041c60..b2f40ca 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-equivalent.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
index 64623cb..f164d4e 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-cqdeps.json
@@ -618,7 +618,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
index c7fa129..efd2244 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing-one-forbidden-cqdeps.json
@@ -711,7 +711,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
index c76f8f1..54fb564 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple-one-missing.json
@@ -435,7 +435,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
index cf526cc..9f732a7 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-multiple.json
@@ -434,7 +434,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
index 5b98f19..2886b86 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try-not-found.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
index 6538fe3..ac0dc60 100644
--- a/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
+++ b/recipe_modules/checkout/tests/submodule.expected/submodule-try.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipe_modules/cq_deps/api.py b/recipe_modules/cq_deps/api.py
index 544bb31..b03b07c 100644
--- a/recipe_modules/cq_deps/api.py
+++ b/recipe_modules/cq_deps/api.py
@@ -176,12 +176,15 @@
to_process.append(dep)
deps[dep.name] = dep
- self.m.step.empty(f'topic {topic}')
- if topic:
+ if not topic:
+ self.m.step.empty('no topic')
+
+ else:
if self._topics_enabled:
+ assert '"' not in topic, f'invalid topic: {topic!r}'
changes = self.m.gerrit.change_query(
f'topic {topic}',
- f'topic:{topic} status:new',
+ f'topic:"{topic}" status:new',
host=f'{gerrit_name}-review.googlesource.com',
max_attempts=2,
timeout=30,
diff --git a/recipe_modules/cq_deps/tests/full.expected/abandoned.json b/recipe_modules/cq_deps/tests/full.expected/abandoned.json
index 7e4e221..5e30f6f 100644
--- a/recipe_modules/cq_deps/tests/full.expected/abandoned.json
+++ b/recipe_modules/cq_deps/tests/full.expected/abandoned.json
@@ -316,7 +316,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/default.json b/recipe_modules/cq_deps/tests/full.expected/default.json
index d8c88d5..c406056 100644
--- a/recipe_modules/cq_deps/tests/full.expected/default.json
+++ b/recipe_modules/cq_deps/tests/full.expected/default.json
@@ -187,7 +187,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/error.json b/recipe_modules/cq_deps/tests/full.expected/error.json
index 79501f3..1ce186c 100644
--- a/recipe_modules/cq_deps/tests/full.expected/error.json
+++ b/recipe_modules/cq_deps/tests/full.expected/error.json
@@ -330,7 +330,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/error_recovery.json b/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
index fe6fec1..49d14fc 100644
--- a/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
+++ b/recipe_modules/cq_deps/tests/full.expected/error_recovery.json
@@ -362,7 +362,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/forbidden.json b/recipe_modules/cq_deps/tests/full.expected/forbidden.json
index 9269c88..010020a 100644
--- a/recipe_modules/cq_deps/tests/full.expected/forbidden.json
+++ b/recipe_modules/cq_deps/tests/full.expected/forbidden.json
@@ -326,7 +326,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/hash.json b/recipe_modules/cq_deps/tests/full.expected/hash.json
index f170b6d..049562c 100644
--- a/recipe_modules/cq_deps/tests/full.expected/hash.json
+++ b/recipe_modules/cq_deps/tests/full.expected/hash.json
@@ -290,7 +290,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/loop_three.json b/recipe_modules/cq_deps/tests/full.expected/loop_three.json
index 78a4b5a..cea6127 100644
--- a/recipe_modules/cq_deps/tests/full.expected/loop_three.json
+++ b/recipe_modules/cq_deps/tests/full.expected/loop_three.json
@@ -422,7 +422,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/loop_two.json b/recipe_modules/cq_deps/tests/full.expected/loop_two.json
index 9ff35a6..39deb15 100644
--- a/recipe_modules/cq_deps/tests/full.expected/loop_two.json
+++ b/recipe_modules/cq_deps/tests/full.expected/loop_two.json
@@ -342,7 +342,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json b/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
index 96df43f..f092b6c 100644
--- a/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
+++ b/recipe_modules/cq_deps/tests/full.expected/merged_skipped.json
@@ -316,7 +316,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/no_space.json b/recipe_modules/cq_deps/tests/full.expected/no_space.json
index adb7d77..a9dc529 100644
--- a/recipe_modules/cq_deps/tests/full.expected/no_space.json
+++ b/recipe_modules/cq_deps/tests/full.expected/no_space.json
@@ -377,7 +377,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/one.json b/recipe_modules/cq_deps/tests/full.expected/one.json
index 933d5e2..9a99d54 100644
--- a/recipe_modules/cq_deps/tests/full.expected/one.json
+++ b/recipe_modules/cq_deps/tests/full.expected/one.json
@@ -319,7 +319,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/patches_json_disabled.json b/recipe_modules/cq_deps/tests/full.expected/patches_json_disabled.json
index 31d52b3..63c90a8 100644
--- a/recipe_modules/cq_deps/tests/full.expected/patches_json_disabled.json
+++ b/recipe_modules/cq_deps/tests/full.expected/patches_json_disabled.json
@@ -149,7 +149,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipe_modules/cq_deps/tests/full.expected/topics-disabled.json b/recipe_modules/cq_deps/tests/full.expected/topics-disabled.json
index 7e231e9..b7a5031 100644
--- a/recipe_modules/cq_deps/tests/full.expected/topics-disabled.json
+++ b/recipe_modules/cq_deps/tests/full.expected/topics-disabled.json
@@ -149,13 +149,6 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic topic",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [],
"name": "resolve CL deps.topic set but topics not enabled",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
diff --git a/recipe_modules/cq_deps/tests/full.expected/topics.json b/recipe_modules/cq_deps/tests/full.expected/topics.json
index 9116335..53aa7b9 100644
--- a/recipe_modules/cq_deps/tests/full.expected/topics.json
+++ b/recipe_modules/cq_deps/tests/full.expected/topics.json
@@ -143,25 +143,18 @@
]
},
{
- "cmd": [],
- "name": "resolve CL deps.topic topic",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
"cmd": [
"[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
"change-query",
"-host",
"https://pigweed-review.googlesource.com",
"-input",
- "{\"params\": {\"q\": \"topic:topic status:new\"}}",
+ "{\"params\": {\"q\": \"topic:\\\"topic\\\" status:new\"}}",
"-output",
"/path/to/tmp/json"
],
"infra_step": true,
- "name": "resolve CL deps.topic topic (2)",
+ "name": "resolve CL deps.topic topic",
"timeout": 30,
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -176,7 +169,7 @@
"@@@STEP_LOG_END@json.output@@@",
"@@@STEP_LOG_LINE@json.input@{@@@",
"@@@STEP_LOG_LINE@json.input@ \"params\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"q\": \"topic:topic status:new\"@@@",
+ "@@@STEP_LOG_LINE@json.input@ \"q\": \"topic:\\\"topic\\\" status:new\"@@@",
"@@@STEP_LOG_LINE@json.input@ }@@@",
"@@@STEP_LOG_LINE@json.input@}@@@",
"@@@STEP_LOG_END@json.input@@@"
diff --git a/recipe_modules/cq_deps/tests/full.expected/two.json b/recipe_modules/cq_deps/tests/full.expected/two.json
index adb7d77..a9dc529 100644
--- a/recipe_modules/cq_deps/tests/full.expected/two.json
+++ b/recipe_modules/cq_deps/tests/full.expected/two.json
@@ -377,7 +377,7 @@
},
{
"cmd": [],
- "name": "resolve CL deps.topic None",
+ "name": "resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index f0005ec..46b1445 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipes/recipes.expected/unittest-only.json b/recipes/recipes.expected/unittest-only.json
index 6a1bc4e..da6ef1f 100644
--- a/recipes/recipes.expected/unittest-only.json
+++ b/recipes/recipes.expected/unittest-only.json
@@ -310,7 +310,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipes/tokendb_check.expected/addition.json b/recipes/tokendb_check.expected/addition.json
index a5188b8..6d53bd8 100644
--- a/recipes/tokendb_check.expected/addition.json
+++ b/recipes/tokendb_check.expected/addition.json
@@ -427,7 +427,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipes/tokendb_check.expected/no-change.json b/recipes/tokendb_check.expected/no-change.json
index 307b302..0cb7420 100644
--- a/recipes/tokendb_check.expected/no-change.json
+++ b/recipes/tokendb_check.expected/no-change.json
@@ -427,7 +427,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipes/tokendb_check.expected/removal.json b/recipes/tokendb_check.expected/removal.json
index 2cef764..af61f25 100644
--- a/recipes/tokendb_check.expected/removal.json
+++ b/recipes/tokendb_check.expected/removal.json
@@ -427,7 +427,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipes/tokendb_check.expected/update.json b/recipes/tokendb_check.expected/update.json
index 325ac7f..f6a4f03 100644
--- a/recipes/tokendb_check.expected/update.json
+++ b/recipes/tokendb_check.expected/update.json
@@ -427,7 +427,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
diff --git a/recipes/xrefs.expected/tryjob.json b/recipes/xrefs.expected/tryjob.json
index 68458d2..ca87a7f 100644
--- a/recipes/xrefs.expected/tryjob.json
+++ b/recipes/xrefs.expected/tryjob.json
@@ -302,7 +302,7 @@
},
{
"cmd": [],
- "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.topic None",
+ "name": "checkout pigweed.change data.process gerrit changes.resolve CL deps.no topic",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@"
]
