nixos/tests/*: editorconfig fixes

This commit is contained in:
zowoq
2020-08-04 00:23:54 +10:00
parent 2b5659c700
commit 8ae7f8c359
14 changed files with 22 additions and 23 deletions
+1 -1
View File
@@ -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",
+1 -1
View File
@@ -43,7 +43,7 @@ in {
nodes = {
client = { ... }: {
services.borgbackup.jobs = {
local = {
paths = dataDir;
repo = localRepo;
+1 -1
View File
@@ -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";
+1 -1
View File
@@ -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 = {
+2 -2
View File
@@ -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");
+1 -1
View File
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
};
nodes =
{
{
client = { };
server =
+1 -1
View File
@@ -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
+ ''
+2 -2
View File
@@ -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;
@@ -1,4 +1,4 @@
let
let
certs = import ./common/acme/server/snakeoil-certs.nix;
in
import ./make-test-python.nix {
+1 -1
View File
@@ -1,4 +1,4 @@
let
let
certs = import ./common/acme/server/snakeoil-certs.nix;
in
import ./make-test-python.nix {
+1 -2
View File
@@ -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
'';
})
+7 -7
View File
@@ -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()
+1 -1
View File
@@ -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")
+1 -1
View File
@@ -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'"
)
'';
})
})