Skip to content

nixosTests.misc: port to python#79064

Merged
flokli merged 2 commits intoNixOS:masterfrom
worldofpeace:port-misc
Feb 2, 2020
Merged

nixosTests.misc: port to python#79064
flokli merged 2 commits intoNixOS:masterfrom
worldofpeace:port-misc

Conversation

@worldofpeace
Copy link
Copy Markdown
Contributor

@worldofpeace worldofpeace commented Feb 2, 2020 •
edited by vcunat
Loading

Motivation for this change

Currently fails because of #79063, but if you comment out that test case you can test it.

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 nixpkgs-review --run "nixpkgs-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.

@worldofpeace worldofpeace mentioned this pull request Feb 2, 2020
Closed
@ofborg ofborg bot added 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. labels Feb 2, 2020
@vcunat
nixosTests.misc: fix blkio sub-test with newer kernels
1af6085 
The blkio.sectors file is no longer provided; by quick search:
https://issues.apache.org/jira/browse/MESOS-9848
so hopefully it's sufficient to test existence of this other file:
https://www.kernel.org/doc/html/v5.4/admin-guide/cgroup-v1/blkio-controller.html#common-files-among-various-policies

Originally this sub-test was added in 58e40f8.
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Feb 2, 2020 •
edited
Loading

I pushed some kind of replacement for that broken part – into this PR due to conflicts. Perhaps /cc @edolstra as the author of this replaced sub-test.

EDIT: well, I assume this PR will get merged very soon. Otherwise I'd unblock the channels first by porting that commit of mine. I haven't reviewed the other changes, at least so far.

@worldofpeace
Copy link
Copy Markdown
Contributor Author

worldofpeace commented Feb 2, 2020

@GrahamcOfBorg test misc

@worldofpeace
Copy link
Copy Markdown
Contributor Author

worldofpeace commented Feb 2, 2020

I pushed some kind of replacement for that broken part – into this PR due to conflicts. Perhaps /cc @edolstra as the author of this replaced sub-test.

EDIT: well, I assume this PR will get merged very soon. Otherwise I'd unblock the channels first by porting that commit of mine. I haven't reviewed the other changes, at least so far.

Thanks, even yet the conflict wouldn't be a problem if that's needed. And this port was pretty 1:1 aside from the json bit and string stripping.

@flokli flokli merged commit 7870644 into NixOS:master Feb 2, 2020
@worldofpeace worldofpeace deleted the port-misc branch February 3, 2020 00:37
@worldofpeace worldofpeace mentioned this pull request Feb 3, 2020
Closed
@nh2 nh2 mentioned this pull request Feb 6, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@worldofpeace @vcunat @flokli