git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79335 from flokli/deprecate-perl-vm-tests

nixos/testing: add deprecation notice for Perl VM tests

commitaa4ba502d6b545da809cc1828412f6866e8e2b02 authorworldofpeace <worldofpeace@protonmail.ch> dateSun 9 Feb 2020, 21:08 (7 years ago) parent55ace3b0945178
3 files changed+9−5
nixos/lib/testing.nix+5−1 pkgs/test/nixos-functions/default.nix+1−1 pkgs/top-level/all-packages.nix+3−3
nixos/lib/testing.nix+5−1
@@ -19,7 +19,11 @@ in rec {
1919 inherit pkgs;
2020
2121
22− testDriver = stdenv.mkDerivation {
22+ testDriver = lib.warn ''
23+ Perl VM tests are deprecated and will be removed for 20.09.
24+ Please update your tests to use the python test driver.
25+ See https://github.com/NixOS/nixpkgs/pull/71684 for details.
26+ '' stdenv.mkDerivation {
2327 name = "nixos-test-driver";
2428
2529 buildInputs = [ makeWrapper perl ];
pkgs/test/nixos-functions/default.nix+1−1
@@ -33,7 +33,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux (
3333 environment.systemPackages = [ pkgs.hello ];
3434 };
3535 testScript = ''
36− $machine->succeed("hello");
36+ machine.succeed("hello")
3737 '';
3838 });
3939
pkgs/top-level/all-packages.nix+3−3
@@ -25026,7 +25026,7 @@ in
2502625026 /*
2502725027 * Run a NixOS VM network test using this evaluation of Nixpkgs.
2502825028 *
25029− * It is mostly equivalent to `import ./make-test.nix` from the
25029+ * It is mostly equivalent to `import ./make-test-python.nix` from the
2503025030 * NixOS manual[1], except that your `pkgs` will be used instead of
2503125031 * letting NixOS invoke Nixpkgs again. If a test machine needs to
2503225032 * set NixOS options under `nixpkgs`, it must set only the
@@ -25052,11 +25052,11 @@ in
2505225052 */
2505325053 nixosTest =
2505425054 let
25055− /* The nixos/lib/testing.nix module, preapplied with arguments that
25055+ /* The nixos/lib/testing-python.nix module, preapplied with arguments that
2505625056 * make sense for this evaluation of Nixpkgs.
2505725057 */
2505825058 nixosTesting =
25059− (import ../../nixos/lib/testing.nix {
25059+ (import ../../nixos/lib/testing-python.nix {
2506025060 inherit (pkgs.stdenv.hostPlatform) system;
2506125061 inherit pkgs;
2506225062 extraConfigurations = [(