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

Jump to bottom

fix tests with nixUnstable #537

Merged
merged 4 commits into from Nov 8, 2020
Merged

fix tests with nixUnstable #537

merged 4 commits into from Nov 8, 2020

Conversation

LnL7
Copy link
Member

@LnL7 LnL7 commented Nov 7, 2020

No description provided.

cole-h
cole-h reviewed Nov 7, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

"The tests that use nix don't work with nixUnstable" -> Which ones are these? Maybe they could be tagged with a TODO / FIXME to that effect.

ofborg/src/maintainers.rs Outdated Show resolved Hide resolved
ofborg/test-srcs/build/default.nix Outdated Show resolved Hide resolved
ofborg/test-srcs/build/default.nix Outdated Show resolved Hide resolved
@LnL7
Copy link
Member Author

LnL7 commented Nov 7, 2020

@cole-h The 2 commits afterwards fix runnign the tests with nixUnstable. Everything succeeds locally again for me after this.

test result: ok. 83 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

@cole-h
Copy link
Member

cole-h commented Nov 7, 2020

Ah, got it. (As you can tell, I didn't actually test it myself hehe.)

@LnL7
make tests a bit less platform dependent
2ddee3c 
NOTE The tests that use nix don't work with nixUnstable since <nix/config.nix>
was removed, which the test expressions depend on.
@LnL7
handle nixUnstable output
8c91336
@LnL7
remove <nix/config.nix> usages
6449f71 
This was removed in nixUnstable.
@LnL7
test-srcs: apply nixpkgs-fmt
502f1dd
cole-h
cole-h approved these changes Nov 8, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

LGTM, and all tests pass now.

@LnL7 LnL7 merged commit d396057 into NixOS:released Nov 8, 2020
@LnL7 LnL7 deleted the fix-tests branch November 8, 2020 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@LnL7 @cole-h