Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/test: Use retry() in all looping functions that need timeouts #74898

Merged
merged 2 commits into from Dec 4, 2019

Conversation

tfc
Copy link
Contributor

@tfc tfc commented Dec 3, 2019

Motivation for this change

#72828

Related to #74868. Use retry in all functions that should wait between retries and also timeout after some time so a test won't hang forever. These changes also resemble what the original perl driver does.

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 @worldofpeace @flokli

@jtojnar
Copy link
Contributor

jtojnar commented Dec 3, 2019

Maybe using the decorator from https://pypi.org/project/retry/ or https://pypi.org/project/retrying/ would be nicer.

@tfc
Copy link
Contributor Author

tfc commented Dec 3, 2019

Maybe using the decorator from https://pypi.org/project/retry/ or https://pypi.org/project/retrying/ would be nicer.

On the one hand: Yes. On the other hand: an extra dependency for such a little function seems like too much. What do you think?

@@ -1,4 +1,4 @@
import ./make-test.nix ({ ... }:
Copy link
Contributor

Choose a reason for hiding this comment

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

This should go in a separate PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

Well, at least it's 2 separate commits, so we can merge this as is.

Still, please open 2 separate PRs next time.

@flokli
Copy link
Contributor

flokli commented Dec 4, 2019

@GrahamcOfBorg test pam-oath-login

@flokli flokli merged commit 746a888 into NixOS:master Dec 4, 2019
@tfc tfc deleted the nixos-test-retry branch December 4, 2019 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants