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.

Sign up for GitHub

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/testing: add deprecation notice for Perl VM tests #79335

Merged
merged 3 commits into from
Feb 10, 2020
Merged

nixos/testing: add deprecation notice for Perl VM tests #79335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6022db4
tests.nixos-functions: port test to python
worldofpeace Feb 9, 2020
d3efeb7
nixosTest: update to make-test-python.nix
worldofpeace Feb 9, 2020
0945178
nixos/testing: add deprecation notice for Perl VM tests
flokli Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion nixos/lib/testing.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ in rec {
inherit pkgs;


testDriver = stdenv.mkDerivation {
testDriver = lib.warn ''
Perl VM tests are deprecated and will be removed for 20.09.
Please update your tests to use the python test driver.
See https://github.com/NixOS/nixpkgs/pull/71684 for details.
'' stdenv.mkDerivation {
name = "nixos-test-driver";

buildInputs = [ makeWrapper perl ];
Expand Down
2 changes: 1 addition & 1 deletion pkgs/test/nixos-functions/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux (
environment.systemPackages = [ pkgs.hello ];
};
testScript = ''
$machine->succeed("hello");
machine.succeed("hello")
'';
});

Expand Down
6 changes: 3 additions & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25033,7 +25033,7 @@ in
/*
* Run a NixOS VM network test using this evaluation of Nixpkgs.
*
* It is mostly equivalent to `import ./make-test.nix` from the
* It is mostly equivalent to `import ./make-test-python.nix` from the
* NixOS manual[1], except that your `pkgs` will be used instead of
* letting NixOS invoke Nixpkgs again. If a test machine needs to
* set NixOS options under `nixpkgs`, it must set only the
Expand All @@ -25059,11 +25059,11 @@ in
*/
nixosTest =
let
/* The nixos/lib/testing.nix module, preapplied with arguments that
/* The nixos/lib/testing-python.nix module, preapplied with arguments that
* make sense for this evaluation of Nixpkgs.
*/
nixosTesting =
(import ../../nixos/lib/testing.nix {
(import ../../nixos/lib/testing-python.nix {
inherit (pkgs.stdenv.hostPlatform) system;
inherit pkgs;
extraConfigurations = [(
Expand Down