diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-07-20 21:06:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-20 21:06:32 +0200 |
commit | 1a6af9f88ec2405334a9fd6a977ccbcb53472305 (patch) | |
tree | 4976952d82daa3fb817193170299fd6f50c6c6d1 /nixos/tests | |
parent | ce12ad31169edfb1de911e54be9230b298e325f3 (diff) | |
parent | 87f5930c3fb2c852f5243278b7a9da8e117d95e4 (diff) |
Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/cjdns.nix | 10 | ||||
-rw-r--r-- | nixos/tests/containers-reloadable.nix | 1 | ||||
-rw-r--r-- | nixos/tests/installer.nix | 3 | ||||
-rw-r--r-- | nixos/tests/pam-oath-login.nix | 2 |
4 files changed, 2 insertions, 14 deletions
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 4d3b58abc6e55..db89c496944e5 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -2,7 +2,6 @@ let carolKey = "2d2a338b46f8e4a8c462f0c385b481292a05f678e19a2b82755258cf0f0af7e2"; carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k"; carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52"; - carolIp4 = "192.168.0.9"; basicConfig = { config, pkgs, ... }: @@ -44,9 +43,7 @@ import ./make-test.nix ({ pkgs, ...} : { bob = { config, lib, nodes, ... }: - let carolIp4 = lib.mkForce nodes.carol.config.networking.interfaces.eth1; in - - { imports = [ basicConfig ]; + { imports = [ basicConfig ]; networking.interfaces.eth1.ipv4.addresses = [ { address = "192.168.0.2"; prefixLength = 24; } @@ -67,10 +64,7 @@ import ./make-test.nix ({ pkgs, ...} : { # but knows neither Alice or Bob. carol = { config, lib, nodes, ... }: - let - carolIp4 = (lib.mkForce nodes.carol.config.networking.interfaces.eth1); - in - { imports = [ basicConfig ]; + { imports = [ basicConfig ]; environment.etc."cjdns.keys".text = '' CJDNS_PRIVATE_KEY=${carolKey} diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 5fb42f2272b35..15862ac64c126 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -45,7 +45,6 @@ in { }; testScript = {nodes, ...}: let - originalSystem = nodes.client.config.system.build.toplevel; c1System = nodes.client_c1.config.system.build.toplevel; c2System = nodes.client_c2.config.system.build.toplevel; in '' diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 875b6c486582d..96230940e8731 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -58,9 +58,6 @@ let ''; - channelContents = [ pkgs.rlwrap ]; - - # The test script boots a NixOS VM, installs NixOS on an empty hard # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix index eb5966d92139b..9f40ecfe865f1 100644 --- a/nixos/tests/pam-oath-login.nix +++ b/nixos/tests/pam-oath-login.nix @@ -12,8 +12,6 @@ let # and picking a the first 4: oathSnakeOilPassword1 = "143349"; oathSnakeOilPassword2 = "801753"; - oathSnakeOilPassword3 = "019933"; - oathSnakeOilPassword4 = "403895"; alicePassword = "foobar"; # Generated via: mkpasswd -m sha-512 and passing in "foobar" |