nixos/tests: fix succeed() with multiple commands #73189
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 tasks
tfc
reviewed
Nov 11, 2019
| @@ -389,7 +390,7 @@ def succeed(self, *commands): | |||
| raise Exception( | |||
| "command `{}` failed (exit code {})".format(command, status) | |||
| ) | |||
| return output | |||
| return output | |||
There was a problem hiding this comment.
the original perl code does $res .= $out; and then in the end return $res. We should do this accumulation, too.
|
How would that look in python? `yield output` from inside the loop?
|
i suggest not going more complex than (status, out) = self.execute(...)
output += out |
we previously immediately returned the first commands output, and didn't execute any of the other commands. Now, return the last commands output. This should be documented in the method docstring.
flokli
force-pushed
the
python-tests-return-multiple
branch
from
bb8aa0f
to
a8e9a93
Compare
|
Updated to handle output as suggested. |
tfc
approved these changes
Nov 11, 2019
marijanp
approved these changes
Nov 11, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
we previously immediately returned the first commands output, and didn't
execute any of the other commands.
Now, return the last commands output.
This should be documented in the method docstring.
cc @Mic92 #73033
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @tfc @marijanp