summaryrefslogtreecommitdiffstats
path: root/nixos/tests
diff options
context:
space:
mode:
authorzowoq <59103226+zowoq@users.noreply.github.com>2020-08-02 19:25:04 +1000
committerzowoq <59103226+zowoq@users.noreply.github.com>2020-08-04 00:23:54 +1000
commit8ae7f8c35998a857f57512ecb7f0fa318ca88463 (patch)
tree539277f1a0f114ead22216a3a15fcbcc00a518d1 /nixos/tests
parent2b5659c7001f34f8ae4b0af7f5e4aa4a3328a4d7 (diff)
nixos/tests/*: editorconfig fixes
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/bcachefs.nix2
-rw-r--r--nixos/tests/borgbackup.nix2
-rw-r--r--nixos/tests/containers-portforward.nix2
-rw-r--r--nixos/tests/corerad.nix2
-rw-r--r--nixos/tests/docker-preloader.nix4
-rw-r--r--nixos/tests/leaps.nix2
-rw-r--r--nixos/tests/mongodb.nix2
-rw-r--r--nixos/tests/nfs/kerberos.nix4
-rw-r--r--nixos/tests/postfix-raise-smtpd-tls-security-level.nix2
-rw-r--r--nixos/tests/postfix.nix2
-rw-r--r--nixos/tests/syncthing-init.nix3
-rw-r--r--nixos/tests/systemd-networkd-vrf.nix14
-rw-r--r--nixos/tests/tiddlywiki.nix2
-rw-r--r--nixos/tests/trickster.nix2
14 files changed, 22 insertions, 23 deletions
diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix
index 0541e5803225..3f116d7df92a 100644
--- a/nixos/tests/bcachefs.nix
+++ b/nixos/tests/bcachefs.nix
@@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.succeed("modprobe bcachefs")
machine.succeed("bcachefs version")
machine.succeed("ls /dev")
-
+
machine.succeed(
"mkdir /tmp/mnt",
"udevadm settle",
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index d97471e293e8..bf37eb8607b2 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -43,7 +43,7 @@ in {
nodes = {
client = { ... }: {
services.borgbackup.jobs = {
-
+
local = {
paths = dataDir;
repo = localRepo;
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index fc90e151bd9e..1e2c2c6c374f 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -5,7 +5,7 @@ let
hostPort = 10080;
containerIp = "192.168.0.100";
containerPort = 80;
-in
+in
import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-portforward";
diff --git a/nixos/tests/corerad.nix b/nixos/tests/corerad.nix
index 72ab255b1916..37a1e90477a8 100644
--- a/nixos/tests/corerad.nix
+++ b/nixos/tests/corerad.nix
@@ -1,7 +1,7 @@
import ./make-test-python.nix (
{
nodes = {
- router = {config, pkgs, ...}: {
+ router = {config, pkgs, ...}: {
config = {
# This machine simulates a router with IPv6 forwarding and a static IPv6 address.
boot.kernel.sysctl = {
diff --git a/nixos/tests/docker-preloader.nix b/nixos/tests/docker-preloader.nix
index eeedec9a392e..c3e8aced351a 100644
--- a/nixos/tests/docker-preloader.nix
+++ b/nixos/tests/docker-preloader.nix
@@ -16,10 +16,10 @@ import ./make-test.nix ({ pkgs, ...} : {
services.openssh.extraConfig = "PermitEmptyPasswords yes";
users.extraUsers.root.password = "";
};
- };
+ };
testScript = ''
startAll;
-
+
$docker->waitForUnit("sockets.target");
$docker->succeed("docker run nix nix-store --version");
$docker->succeed("docker run bash bash --version");
diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix
index 65b475d734ec..ac0c602d4450 100644
--- a/nixos/tests/leaps.nix
+++ b/nixos/tests/leaps.nix
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
};
nodes =
- {
+ {
client = { };
server =
diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 453fb569e8c4..1a7123883018 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -45,7 +45,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
node.start()
''
+ runMongoDBTest pkgs.mongodb-3_4
- + runMongoDBTest pkgs.mongodb-3_6
+ + runMongoDBTest pkgs.mongodb-3_6
+ runMongoDBTest pkgs.mongodb-4_0
+ runMongoDBTest pkgs.mongodb-4_2
+ ''
diff --git a/nixos/tests/nfs/kerberos.nix b/nixos/tests/nfs/kerberos.nix
index 1f2d0d453ea0..078f0b7814ce 100644
--- a/nixos/tests/nfs/kerberos.nix
+++ b/nixos/tests/nfs/kerberos.nix
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
with lib;
let
- krb5 =
+ krb5 =
{ enable = true;
domain_realm."nfs.test" = "NFS.TEST";
libdefaults.default_realm = "NFS.TEST";
@@ -31,7 +31,7 @@ in
{
name = "nfsv4-with-kerberos";
-
+
nodes = {
client = { lib, ... }:
{ inherit krb5 users;
diff --git a/nixos/tests/postfix-raise-smtpd-tls-security-level.nix b/nixos/tests/postfix-raise-smtpd-tls-security-level.nix
index bfe02865553f..b3c2156122d2 100644
--- a/nixos/tests/postfix-raise-smtpd-tls-security-level.nix
+++ b/nixos/tests/postfix-raise-smtpd-tls-security-level.nix
@@ -1,4 +1,4 @@
-let
+let
certs = import ./common/acme/server/snakeoil-certs.nix;
in
import ./make-test-python.nix {
diff --git a/nixos/tests/postfix.nix b/nixos/tests/postfix.nix
index 0d677427d761..b0674ca3a0d2 100644
--- a/nixos/tests/postfix.nix
+++ b/nixos/tests/postfix.nix
@@ -1,4 +1,4 @@
-let
+let
certs = import ./common/acme/server/snakeoil-certs.nix;
in
import ./make-test-python.nix {
diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix
index 9c8e0a3d087e..0a01da52b68b 100644
--- a/nixos/tests/syncthing-init.nix
+++ b/nixos/tests/syncthing-init.nix
@@ -24,9 +24,8 @@ in {
testScript = ''
machine.wait_for_unit("syncthing-init.service")
config = machine.succeed("cat /var/lib/syncthing/.config/syncthing/config.xml")
-
+
assert "testFolder" in config
assert "${testId}" in config
'';
})
-
diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix
index 123e1f26b511..d12aa409ec0a 100644
--- a/nixos/tests/systemd-networkd-vrf.nix
+++ b/nixos/tests/systemd-networkd-vrf.nix
@@ -160,19 +160,19 @@ in {
node3.wait_for_unit("network.target")
client_ipv4_table = """
- 192.168.1.2 dev vrf1 proto static metric 100
+ 192.168.1.2 dev vrf1 proto static metric 100
192.168.2.3 dev vrf2 proto static metric 100
""".strip()
vrf1_table = """
- broadcast 192.168.1.0 dev eth1 proto kernel scope link src 192.168.1.1
- 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1
- local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1
+ broadcast 192.168.1.0 dev eth1 proto kernel scope link src 192.168.1.1
+ 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1
+ local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1
broadcast 192.168.1.255 dev eth1 proto kernel scope link src 192.168.1.1
""".strip()
vrf2_table = """
- broadcast 192.168.2.0 dev eth2 proto kernel scope link src 192.168.2.1
- 192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1
- local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1
+ broadcast 192.168.2.0 dev eth2 proto kernel scope link src 192.168.2.1
+ 192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1
+ local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1
broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1
""".strip()
diff --git a/nixos/tests/tiddlywiki.nix b/nixos/tests/tiddlywiki.nix
index cf45578b0f98..822711b8939c 100644
--- a/nixos/tests/tiddlywiki.nix
+++ b/nixos/tests/tiddlywiki.nix
@@ -44,7 +44,7 @@ import ./make-test-python.nix ({ ... }: {
configured.succeed(
"curl --fail -o /dev/null 127.0.0.1:3000 --user somelogin:somesecret"
)
-
+
with subtest("restart preserves changes"):
# given running wiki
default.wait_for_unit("tiddlywiki.service")
diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix
index aff4f7eb9125..c65160f81e38 100644
--- a/nixos/tests/trickster.nix
+++ b/nixos/tests/trickster.nix
@@ -34,4 +34,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
"curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"
)
'';
-}) \ No newline at end of file
+})