| Message ID | 20180717192552.198496-20-sjg@chromium.org |
|---|---|
| State | Accepted |
| Commit | 2b19321ef9cdc77e00c4d063330e2a4a6818c4fc |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | binman: Expand feature set and documentation | expand |
diff --git a/tools/patman/command.py b/tools/patman/command.py index 598bfdcd90..14edcdaffd 100644 --- a/tools/patman/command.py +++ b/tools/patman/command.py @@ -61,8 +61,12 @@ def RunPipe(pipe_list, infile=None, outfile=None, """ if test_result: if hasattr(test_result, '__call__'): - return test_result(pipe_list=pipe_list) - return test_result + result = test_result(pipe_list=pipe_list) + if result: + return result + else: + return test_result + # No result: fall through to normal processing result = CommandResult() last_pipe = None pipeline = list(pipe_list)
Tests use the 'test_result' feature to return a predetermined command result for particular commands. The avoids needing to have the real command available just to run a test. It works by calling the function provided by the test, to get the value. However sometimes the test does need to run the real command. Allow it to fall back to do this when the function does not return a result. Signed-off-by: Simon Glass <sjg@chromium.org> --- tools/patman/command.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)