git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #78556 from tfc/port-tests

nixosTests: Port more tests

commit0ec03e182c3a3385f7da66b279a5d6b47adac869 authorFlorian Klink <flokli@flokli.de> dateSun 2 Feb 2020, 11:03 (7 years ago) parent5de5d755ae9820
3 files changed+162−141
nixos/tests/buildbot.nix+65−65 nixos/tests/ihatemoney.nix+31−28 nixos/tests/keymap.nix+66−48
nixos/tests/buildbot.nix+65−65
@@ -1,12 +1,11 @@
1+# Test ensures buildbot master comes up correctly and workers can connect
2+
13{ system ? builtins.currentSystem,
24 config ? {},
35 pkgs ? import ../.. { inherit system config; }
46}:
57
6−with import ../lib/testing.nix { inherit system pkgs; };
7−
8−# Test ensures buildbot master comes up correctly and workers can connect
9−makeTest {
8+import ./make-test-python.nix {
109 name = "buildbot";
1110
1211 nodes = {
@@ -39,75 +38,76 @@ makeTest {
3938 services.openssh.enable = true;
4039 networking.firewall.allowedTCPPorts = [ 22 9418 ];
4140 environment.systemPackages = with pkgs; [ git ];
41+ systemd.services.git-daemon = {
42+ description = "Git daemon for the test";
43+ wantedBy = [ "multi-user.target" ];
44+ after = [ "network.target" ];
45+
46+ serviceConfig.Restart = "always";
47+ path = with pkgs; [ coreutils git openssh ];
48+ environment = { HOME = "/root"; };
49+ preStart = ''
50+ git config --global user.name 'Nobody Fakeuser'
51+ git config --global user.email 'nobody\@fakerepo.com'
52+ rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo
53+ mkdir -pv /srv/repos/fakerepo ~/.ssh
54+ ssh-keyscan -H gitrepo > ~/.ssh/known_hosts
55+ cat ~/.ssh/known_hosts
56+
57+ mkdir -p /src/repos/fakerepo
58+ cd /srv/repos/fakerepo
59+ rm -rf *
60+ git init
61+ echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh
62+ cat fakerepo.sh
63+ touch .git/git-daemon-export-ok
64+ git add fakerepo.sh .git/git-daemon-export-ok
65+ git commit -m fakerepo
66+ '';
67+ script = ''
68+ git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr
69+ '';
70+ };
4271 };
4372 };
4473
4574 testScript = ''
46− #Start up and populate fake repo
47− $gitrepo->waitForUnit("multi-user.target");
48− print($gitrepo->execute(" \
49− git config --global user.name 'Nobody Fakeuser' && \
50− git config --global user.email 'nobody\@fakerepo.com' && \
51− rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
52− mkdir -pv /srv/repos/fakerepo ~/.ssh && \
53− ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
54− cat ~/.ssh/known_hosts && \
55− cd /srv/repos/fakerepo && \
56− git init && \
57− echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
58− cat fakerepo.sh && \
59− touch .git/git-daemon-export-ok && \
60− git add fakerepo.sh .git/git-daemon-export-ok && \
61− git commit -m fakerepo && \
62− git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
63− "));
64−
65− # Test gitrepo
66− $bbmaster->waitForUnit("network-online.target");
67− #$bbmaster->execute("nc -z gitrepo 9418");
68− print($bbmaster->execute(" \
69− rm -rfv /tmp/fakerepo && \
70− git clone git://gitrepo/fakerepo /tmp/fakerepo && \
71− pwd && \
72− ls -la && \
73− ls -la /tmp/fakerepo \
74− "));
75−
76− # Test start master and connect worker
77− $bbmaster->waitForUnit("buildbot-master.service");
78− $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
79− $bbworker->waitForUnit("network-online.target");
80− $bbworker->execute("nc -z bbmaster 8010");
81− $bbworker->execute("nc -z bbmaster 9989");
82− $bbworker->waitForUnit("buildbot-worker.service");
83− print($bbworker->execute("ls -la /home/bbworker/worker"));
84−
75+ gitrepo.wait_for_unit("git-daemon.service")
76+ gitrepo.wait_for_unit("multi-user.target")
8577
86− # Test stop buildbot master and worker
87− print($bbmaster->execute(" \
88− systemctl -l --no-pager status buildbot-master && \
89− systemctl stop buildbot-master \
90− "));
91− $bbworker->fail("nc -z bbmaster 8010");
92− $bbworker->fail("nc -z bbmaster 9989");
93− print($bbworker->execute(" \
94− systemctl -l --no-pager status buildbot-worker && \
95− systemctl stop buildbot-worker && \
96− ls -la /home/bbworker/worker \
97− "));
78+ with subtest("Repo is accessible via git daemon"):
79+ bbmaster.wait_for_unit("network-online.target")
80+ bbmaster.succeed("rm -rfv /tmp/fakerepo")
81+ bbmaster.succeed("git clone git://gitrepo/fakerepo /tmp/fakerepo")
9882
83+ with subtest("Master service and worker successfully connect"):
84+ bbmaster.wait_for_unit("buildbot-master.service")
85+ bbmaster.wait_until_succeeds("curl --fail -s --head http://bbmaster:8010")
86+ bbworker.wait_for_unit("network-online.target")
87+ bbworker.succeed("nc -z bbmaster 8010")
88+ bbworker.succeed("nc -z bbmaster 9989")
89+ bbworker.wait_for_unit("buildbot-worker.service")
9990
100− # Test buildbot daemon mode
101− $bbmaster->execute("buildbot create-master /tmp");
102− $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
103− $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
104− $bbmaster->execute("buildbot start /tmp");
105− $bbworker->execute("nc -z bbmaster 8011");
106− $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
107− $bbmaster->execute("buildbot stop /tmp");
108− $bbworker->fail("nc -z bbmaster 8011");
91+ with subtest("Stop buildbot worker"):
92+ bbmaster.succeed("systemctl -l --no-pager status buildbot-master")
93+ bbmaster.succeed("systemctl stop buildbot-master")
94+ bbworker.fail("nc -z bbmaster 8010")
95+ bbworker.fail("nc -z bbmaster 9989")
96+ bbworker.succeed("systemctl -l --no-pager status buildbot-worker")
97+ bbworker.succeed("systemctl stop buildbot-worker")
10998
99+ with subtest("Buildbot daemon mode works"):
100+ bbmaster.succeed(
101+ "buildbot create-master /tmp",
102+ "mv -fv /tmp/master.cfg.sample /tmp/master.cfg",
103+ "sed -i 's/8010/8011/' /tmp/master.cfg",
104+ "buildbot start /tmp",
105+ "nc -z bbmaster 8011",
106+ )
107+ bbworker.wait_until_succeeds("curl --fail -s --head http://bbmaster:8011")
108+ bbmaster.wait_until_succeeds("buildbot stop /tmp")
109+ bbworker.fail("nc -z bbmaster 8011")
110110 '';
111111
112112 meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
113−}
113+} {}
nixos/tests/ihatemoney.nix+31−28
@@ -1,13 +1,5 @@
1−{ system ? builtins.currentSystem
2−, config ? {}
3−, pkgs ? import ../.. { inherit system config; }
4−}:
5−
61let
7− inherit (import ../lib/testing.nix { inherit system pkgs; }) makeTest;
8−in
9−map (
10− backend: makeTest {
2+ f = backend: import ./make-test-python.nix ({ pkgs, ... }: {
113 name = "ihatemoney-${backend}";
124 machine = { lib, ... }: {
135 services.ihatemoney = {
@@ -30,23 +22,34 @@ map (
3022 };
3123 };
3224 testScript = ''
33− $machine->waitForOpenPort(8000);
34− $machine->waitForUnit("uwsgi.service");
35− my $return = $machine->succeed("curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay\@example.com'");
36− die "wrong project id $return" unless "\"yay\"\n" eq $return;
37− my $timestamp = $machine->succeed("stat --printf %Y /var/lib/ihatemoney/secret_key");
38− my $owner = $machine->succeed("stat --printf %U:%G /var/lib/ihatemoney/secret_key");
39− die "wrong ownership for the secret key: $owner, is uwsgi running as the right user ?" unless $owner eq "ihatemoney:ihatemoney";
40− $machine->shutdown();
41− $machine->start();
42− $machine->waitForOpenPort(8000);
43− $machine->waitForUnit("uwsgi.service");
44− # check that the database is really persistent
45− print $machine->succeed("curl --basic -u yay:yay http://localhost:8000/api/projects/yay");
46− # check that the secret key is really persistent
47− my $timestamp2 = $machine->succeed("stat --printf %Y /var/lib/ihatemoney/secret_key");
48− die unless $timestamp eq $timestamp2;
49− $machine->succeed("curl http://localhost:8000 | grep ihatemoney");
25+ machine.wait_for_open_port(8000)
26+ machine.wait_for_unit("uwsgi.service")
27+
28+ assert '"yay"' in machine.succeed(
29+ "curl -X POST http://localhost:8000/api/projects -d 'name=yay&id=yay&password=yay&contact_email=yay\@example.com'"
30+ )
31+ owner, timestamp = machine.succeed(
32+ "stat --printf %U:%G___%Y /var/lib/ihatemoney/secret_key"
33+ ).split("___")
34+ assert "ihatemoney:ihatemoney" == owner
35+
36+ with subtest("Restart machine and service"):
37+ machine.shutdown()
38+ machine.start()
39+ machine.wait_for_open_port(8000)
40+ machine.wait_for_unit("uwsgi.service")
41+
42+ with subtest("check that the database is really persistent"):
43+ machine.succeed("curl --basic -u yay:yay http://localhost:8000/api/projects/yay")
44+
45+ with subtest("check that the secret key is really persistent"):
46+ timestamp2 = machine.succeed("stat --printf %Y /var/lib/ihatemoney/secret_key")
47+ assert timestamp == timestamp2
48+
49+ assert "ihatemoney" in machine.succeed("curl http://localhost:8000")
5050 '';
51− }
52−) [ "sqlite" "postgresql" ]
51+ });
52+in {
53+ ihatemoney-sqlite = f "sqlite";
54+ ihatemoney-postgresql = f "postgresql";
55+}
nixos/tests/keymap.nix+66−48
@@ -3,14 +3,13 @@
33 pkgs ? import ../.. { inherit system config; }
44}:
55
6−with import ../lib/testing.nix { inherit system pkgs; };
6+with import ../lib/testing-python.nix { inherit system pkgs; };
77
88let
99 readyFile = "/tmp/readerReady";
1010 resultFile = "/tmp/readerResult";
1111
1212 testReader = pkgs.writeScript "test-input-reader" ''
13− #!${pkgs.stdenv.shell}
1413 rm -f ${resultFile} ${resultFile}.tmp
1514 logger "testReader: START: Waiting for $1 characters, expecting '$2'."
1615 touch ${readyFile}
@@ -27,56 +26,75 @@ let
2726 '';
2827
2928
30− mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let
31− combinedTests = foldAttrs (acc: val: acc ++ val) [] (builtins.attrValues tests);
32− perlStr = val: "'${escape ["'" "\\"] val}'";
33− lq = length combinedTests.qwerty;
34− le = length combinedTests.expect;
35− msg = "length mismatch between qwerty (${toString lq}) and expect (${toString le}) lists!";
36− send = concatMapStringsSep ", " perlStr combinedTests.qwerty;
37− expect = if (lq == le) then concatStrings combinedTests.expect else throw msg;
38−
39− in makeTest {
29+ mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; makeTest {
4030 name = "keymap-${layout}";
4131
32+ machine.console.keyMap = mkOverride 900 layout;
4233 machine.services.xserver.desktopManager.xterm.enable = false;
43− machine.i18n.consoleKeyMap = mkOverride 900 layout;
4434 machine.services.xserver.layout = mkOverride 900 layout;
4535 machine.imports = [ ./common/x11.nix extraConfig ];
4636
4737 testScript = ''
48−
49− sub mkTest ($$) {
50− my ($desc, $cmd) = @_;
51−
52− subtest $desc, sub {
53− # prepare and start testReader
54− $machine->execute("rm -f ${readyFile} ${resultFile}");
55− $machine->succeed("$cmd ${testReader} ${toString le} ".q(${escapeShellArg expect} & ));
56−
57− if ($desc eq "Xorg keymap") {
58− # make sure the xterm window is open and has focus
59− $machine->waitForWindow(qr/testterm/);
60− $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync");
61− }
62−
63− # wait for reader to be ready
64− $machine->waitForFile("${readyFile}");
65− $machine->sleep(1);
66−
67− # send all keys
68− foreach ((${send})) { $machine->sendKeys($_); };
69−
70− # wait for result and check
71− $machine->waitForFile("${resultFile}");
72− $machine->succeed("grep -q 'PASS:' ${resultFile}");
73− };
74− };
75−
76− $machine->waitForX;
77−
78− mkTest "VT keymap", "openvt -sw --";
79− mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e";
38+ import json
39+ import shlex
40+
41+
42+ def run_test_case(cmd, xorg_keymap, test_case_name, inputs, expected):
43+ with subtest(test_case_name):
44+ assert len(inputs) == len(expected)
45+ machine.execute("rm -f ${readyFile} ${resultFile}")
46+
47+ # set up process that expects all the keys to be entered
48+ machine.succeed(
49+ "{} {} {} {} &".format(
50+ cmd,
51+ "${testReader}",
52+ len(inputs),
53+ shlex.quote("".join(expected)),
54+ )
55+ )
56+
57+ if xorg_keymap:
58+ # make sure the xterm window is open and has focus
59+ machine.wait_for_window("testterm")
60+ machine.wait_until_succeeds(
61+ "${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible "
62+ "--class testterm windowfocus --sync"
63+ )
64+
65+ # wait for reader to be ready
66+ machine.wait_for_file("${readyFile}")
67+ machine.sleep(1)
68+
69+ # send all keys
70+ for key in inputs:
71+ machine.send_key(key)
72+
73+ # wait for result and check
74+ machine.wait_for_file("${resultFile}")
75+ machine.succeed("grep -q 'PASS:' ${resultFile}")
76+
77+
78+ with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file:
79+ tests = json.load(json_file)
80+
81+ keymap_environments = {
82+ "VT Keymap": "openvt -sw --",
83+ "Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e",
84+ }
85+
86+ machine.wait_for_x()
87+
88+ for keymap_env_name, command in keymap_environments.items():
89+ with subtest(keymap_env_name):
90+ for test_case_name, test_data in tests.items():
91+ run_test_case(
92+ command,
93+ False,
94+ test_case_name,
95+ test_data["qwerty"],
96+ test_data["expect"],
97+ )
8098 '';
8199 };
82100
@@ -89,7 +107,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
89107 altgr.expect = [ "~" "#" "{" "[" "|" ];
90108 };
91109
92− extraConfig.i18n.consoleKeyMap = "azerty/fr";
110+ extraConfig.console.keyMap = "azerty/fr";
93111 extraConfig.services.xserver.layout = "fr";
94112 };
95113
@@ -99,7 +117,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
99117 homerow.expect = [ "a" "r" "s" "t" "n" "e" "i" "o" ];
100118 };
101119
102− extraConfig.i18n.consoleKeyMap = "colemak/colemak";
120+ extraConfig.console.keyMap = "colemak/colemak";
103121 extraConfig.services.xserver.layout = "us";
104122 extraConfig.services.xserver.xkbVariant = "colemak";
105123 };
@@ -151,7 +169,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
151169 altgr.expect = [ "@" "|" "{" "[" "]" "}" ];
152170 };
153171
154− extraConfig.i18n.consoleKeyMap = "de";
172+ extraConfig.console.keyMap = "de";
155173 extraConfig.services.xserver.layout = "de";
156174 };
157175}