Backport little recipe changes from the big refactor.

R=tandrii@chromium.org

Bug: 910369
Change-Id: Id0a4acbc440e94301f9be879818796581c999b80
Reviewed-on: https://chromium-review.googlesource.com/c/infra/luci/recipes-py/+/1601694
Auto-Submit: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
diff --git a/recipe_modules/context/examples/full.py b/recipe_modules/context/examples/full.py
index 740033e..4f0893e 100644
--- a/recipe_modules/context/examples/full.py
+++ b/recipe_modules/context/examples/full.py
@@ -34,13 +34,10 @@
     api.step('env step', ['bash', '-c', 'echo $FOO'])
 
     with api.context(env_prefixes={'FOO': [pants, shirt]}):
-      expected = api.path.pathsep.join([str(pants), str(shirt), 'bar'])
-      result = api.step('env step with prefix',
-                        ['bash', '-c', 'echo $FOO'])
+      api.step('env step with prefix', ['bash', '-c', 'echo $FOO'])
 
   # Path prefix won't append empty environment variables.
   with api.context(env={'FOO': ''}, env_prefixes={'FOO': [pants, shirt]}):
-    expected = api.path.pathsep.join([str(pants), str(shirt)])
     result = api.step('env prefixes with empty value',
                       ['bash', '-c', 'echo $FOO'])
 
diff --git a/recipe_modules/context/tests/infra_step.py b/recipe_modules/context/tests/infra_step.py
index ebb7561..13ec3d5 100644
--- a/recipe_modules/context/tests/infra_step.py
+++ b/recipe_modules/context/tests/infra_step.py
@@ -17,7 +17,7 @@
   except api.step.StepFailure:
     was_infra_failure = False
 
-  assert was_infra_failure is False
+  assert was_infra_failure is False, 'got: %r' % was_infra_failure
 
   with api.context(infra_steps=True):
     was_infra_failure = None
diff --git a/recipe_modules/python/tests/infra_failing_step.py b/recipe_modules/python/tests/infra_failing_step.py
index 7c0ee11..bb5b501 100644
--- a/recipe_modules/python/tests/infra_failing_step.py
+++ b/recipe_modules/python/tests/infra_failing_step.py
@@ -33,7 +33,8 @@
 
 def GenTests(api):
   yield (
-      api.test('basic') +
-      api.post_process(post_process.MustRun, 'InfraFailure') +
-      api.post_process(post_process.StatusSuccess) +
-      api.post_process(post_process.DropExpectation))
+      api.test('basic')
+      + api.post_process(post_process.MustRun, 'InfraFailure')
+      + api.post_process(post_process.StatusSuccess)
+      + api.post_process(post_process.DropExpectation)
+  )