Skip to content

nixos/test-driver: run callbacks during Machine.wait_for_console_text#155730

Open
Synthetica9 wants to merge 6 commits intoNixOS:masterfrom
Synthetica9:test-for-failure
Open

nixos/test-driver: run callbacks during Machine.wait_for_console_text#155730
Synthetica9 wants to merge 6 commits intoNixOS:masterfrom
Synthetica9:test-for-failure

Conversation

@Synthetica9
Copy link
Member

@Synthetica9 Synthetica9 commented Jan 19, 2022

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@Synthetica9 Synthetica9 requested a review from tfc as a code owner January 19, 2022 21:38
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jan 19, 2022
@Synthetica9 Synthetica9 requested a review from edolstra as a code owner January 19, 2022 21:49
@github-actions github-actions bot added the 6.topic: policy discussion Discuss policies to work in and around Nixpkgs label Jan 19, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 19, 2022
rnhmjoj
rnhmjoj reviewed Jan 20, 2022
View reviewed changes
rnhmjoj
rnhmjoj reviewed Jan 20, 2022
View reviewed changes
nixos/lib/test-driver/test_driver/machine.py Outdated
Copy link
Contributor

@rnhmjoj rnhmjoj Jan 20, 2022

Choose a reason for hiding this comment

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

I think this is possibly a breaking change: any reason why you're making it non-blocking?

Copy link
Member Author

@Synthetica9 Synthetica9 Jan 20, 2022

Choose a reason for hiding this comment

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

Because otherwise it will wait forever and never run the scheduled callbacks. When it times out it throws Empty, which was already caught, so it basically just runs callbacks and then retries (we could probably also get rid of the sleep here)

Copy link
Member Author

@Synthetica9 Synthetica9 Jan 20, 2022

Choose a reason for hiding this comment

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

(I'm not sure how you imagine this to fail, but I personally don't see it)

Copy link
Member Author

@Synthetica9 Synthetica9 Jan 20, 2022

Choose a reason for hiding this comment

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

(just realized Machine.sleep also indirectly runs callbacks, so I guess just setting the timeout would be enough here)

tfc
tfc reviewed Jan 20, 2022
View reviewed changes
nixos/lib/test-driver/test_driver/driver.py Outdated
Copy link
Contributor

@tfc tfc Jan 20, 2022

Choose a reason for hiding this comment

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

it looks like this isn't used anywhere, or ist it just too early in the morning for me?

Copy link
Member Author

@Synthetica9 Synthetica9 Jan 20, 2022

Choose a reason for hiding this comment

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

No it was too late at night last night I guess. I packaged all prerequisites for the I wrote for #155622 into one pr, should've mentioned that. I also wrote a similar local function in #154168, and it seems like it would be more generally useful so I thought it would be best to just provide it within the test driver

@mainrs mainrs mentioned this pull request Jan 22, 2022
Closed
13 tasks
@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 31, 2022
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Mar 20, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tfc tfc tfc left review comments

@rnhmjoj rnhmjoj rnhmjoj left review comments

@edolstra edolstra Awaiting requested review from edolstra

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

QEMU VM tests refactors
Status: No status

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Synthetica9 @tfc @rnhmjoj @wegank