module_deps: Migrate to standard StepCwdEquals This test assertion has been upstreamed in http://crrev.com/c/7989352. Change-Id: I316e5f190108a3192e2efcd23a62945057c346df Reviewed-on: https://pigweed-review.googlesource.com/c/infra/recipes/+/429154
diff --git a/recipes/module_deps.py b/recipes/module_deps.py index 236af50..dd0847f 100644 --- a/recipes/module_deps.py +++ b/recipes/module_deps.py
@@ -177,17 +177,6 @@ def GenTests( api: recipe_test_api.RecipeTestApi, ) -> Iterator[recipe_test_api.TestData]: - def step_cwd_equals(check, step_odict, step_name, expected_cwd): - step = step_odict.get(step_name) - if check(f'step {step_name} exists', step is not None): - actual_cwd = ( - step.cwd if hasattr(step, 'cwd') else step.get('cwd', '') - ) - check( - f'step {step_name} cwd is {expected_cwd} (actual: {actual_cwd})', - actual_cwd == expected_cwd, - ) - def properties(**kwargs: Any) -> recipe_test_api.TestData: props = InputProperties(**kwargs) props.checkout_options.CopyFrom(api.checkout.git_options()) @@ -343,13 +332,13 @@ ), api.post_check(post_process.MustRun, 'cmake.cmake configure'), api.post_check( - step_cwd_equals, + post_process.StepCwdEquals, 'cmake.cmake configure', '[START_DIR]/co/my_sub_dir', ), api.post_check(post_process.MustRun, 'cmake.cmake graphviz'), api.post_check( - step_cwd_equals, + post_process.StepCwdEquals, 'cmake.cmake graphviz', '[START_DIR]/co/my_sub_dir/out', ),