Skip to content

nixos/tests: fix succeed() with multiple commands#73189

Merged
Mic92 merged 1 commit intoNixOS:masterfrom
flokli:python-tests-return-multiple
Nov 11, 2019
Merged

nixos/tests: fix succeed() with multiple commands#73189
Mic92 merged 1 commit intoNixOS:masterfrom
flokli:python-tests-return-multiple

Conversation

@flokli
Copy link
Copy Markdown
Member

@flokli flokli commented Nov 11, 2019

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @tfc @marijanp

@ofborg ofborg bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Nov 11, 2019
@flokli flokli mentioned this pull request Nov 11, 2019
10 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 11, 2019
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the original perl code does $res .= $out; and then in the end return $res. We should do this accumulation, too.

@flokli
Copy link
Copy Markdown
Member Author

flokli commented Nov 11, 2019 via email

@tfc
Copy link
Copy Markdown
Contributor

tfc commented Nov 11, 2019

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 flokli force-pushed the python-tests-return-multiple branch from bb8aa0f to a8e9a93 Compare November 11, 2019 12:45
@flokli
Copy link
Copy Markdown
Member Author

flokli commented Nov 11, 2019

Updated to handle output as suggested.

@Mic92 Mic92 merged commit 556a169 into NixOS:master Nov 11, 2019
@flokli flokli deleted the python-tests-return-multiple branch November 11, 2019 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants