git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #63150 from Izorkin/prosody-test

nixos/tests/prosody: update prosody tests

commit0f32b32c959faeab40c84ca84b0da471f650115a authorMatthieu Coudron <mattator@gmail.com> dateTue 20 Aug 2019, 17:52 (7 years ago) parent1f80bae89c69bf
7 files changed+128−41
nixos/tests/all-tests.nix+3−2 nixos/tests/prosody.nix−38 nixos/tests/ejabberd.nix → nixos/tests/xmpp/ejabberd.nix+1−1 nixos/tests/xmpp/prosody-mysql.nix+77 nixos/tests/xmpp/prosody.nix+46 nixos/tests/xmpp-sendmessage.nix → nixos/tests/xmpp/xmpp-sendmessage.nix pkgs/top-level/all-packages.nix+1
nixos/tests/all-tests.nix+3−2
@@ -74,7 +74,7 @@ in
7474 #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
7575 ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};
7676 ecryptfs = handleTest ./ecryptfs.nix {};
77− ejabberd = handleTest ./ejabberd.nix {};
77+ ejabberd = handleTest ./xmpp/ejabberd.nix {};
7878 elk = handleTestOn ["x86_64-linux"] ./elk.nix {};
7979 env = handleTest ./env.nix {};
8080 etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
@@ -221,7 +221,8 @@ in
221221 prometheus = handleTest ./prometheus.nix {};
222222 prometheus2 = handleTest ./prometheus-2.nix {};
223223 prometheus-exporters = handleTest ./prometheus-exporters.nix {};
224− prosody = handleTest ./prosody.nix {};
224+ prosody = handleTest ./xmpp/prosody.nix {};
225+ prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
225226 proxy = handleTest ./proxy.nix {};
226227 quagga = handleTest ./quagga.nix {};
227228 quake3 = handleTest ./quake3.nix {};
nixos/tests/prosody.nixdeleted−38
@@ -1,38 +0,0 @@
1−import ./make-test.nix {
2− name = "prosody";
3−
4− machine = { pkgs, ... }: {
5− services.prosody = {
6− enable = true;
7− # TODO: use a self-signed certificate
8− c2sRequireEncryption = false;
9− extraConfig = ''
10− storage = "sql"
11− '';
12− virtualHosts.test = {
13− domain = "example.com";
14− enabled = true;
15− };
16− };
17− environment.systemPackages = [
18− (pkgs.callPackage ./xmpp-sendmessage.nix {})
19− ];
20− };
21−
22− testScript = ''
23− $machine->waitForUnit('prosody.service');
24− $machine->succeed('prosodyctl status') =~ /Prosody is running/;
25−
26− # set password to 'nothunter2' (it's asked twice)
27− $machine->succeed('yes nothunter2 | prosodyctl adduser cthon98@example.com');
28− # set password to 'y'
29− $machine->succeed('yes | prosodyctl adduser azurediamond@example.com');
30− # correct password to 'hunter2'
31− $machine->succeed('yes hunter2 | prosodyctl passwd azurediamond@example.com');
32−
33− $machine->succeed("send-message");
34−
35− $machine->succeed('prosodyctl deluser cthon98@example.com');
36− $machine->succeed('prosodyctl deluser azurediamond@example.com');
37− '';
38−}
nixos/tests/ejabberd.nix → nixos/tests/xmpp/ejabberd.nixrenamed+1−1
@@ -1,4 +1,4 @@
1−import ./make-test.nix ({ pkgs, ... }: {
1+import ../make-test.nix ({ pkgs, ... }: {
22 name = "ejabberd";
33 meta = with pkgs.stdenv.lib.maintainers; {
44 maintainers = [ ajs124 ];
nixos/tests/xmpp/prosody-mysql.nixnew file+77
@@ -0,0 +1,77 @@
1+import ../make-test.nix {
2+ name = "prosody-mysql";
3+
4+ nodes = {
5+ client = { nodes, pkgs, ... }: {
6+ environment.systemPackages = [
7+ (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; })
8+ ];
9+ };
10+ server = { config, pkgs, ... }: {
11+ nixpkgs.overlays = [
12+ (self: super: {
13+ prosody = super.prosody.override {
14+ withDBI = true;
15+ withExtraLibs = [ pkgs.luaPackages.luadbi-mysql ];
16+ };
17+ })
18+ ];
19+ networking.extraHosts = ''
20+ ${config.networking.primaryIPAddress} example.com
21+ '';
22+ networking.firewall.enable = false;
23+ services.prosody = {
24+ enable = true;
25+ # TODO: use a self-signed certificate
26+ c2sRequireEncryption = false;
27+ extraConfig = ''
28+ storage = "sql"
29+ sql = {
30+ driver = "MySQL";
31+ database = "prosody";
32+ host = "mysql";
33+ port = 3306;
34+ username = "prosody";
35+ password = "password123";
36+ };
37+ '';
38+ virtualHosts.test = {
39+ domain = "example.com";
40+ enabled = true;
41+ };
42+ };
43+ };
44+ mysql = { config, pkgs, ... }: {
45+ networking.firewall.enable = false;
46+ services.mysql = {
47+ enable = true;
48+ initialScript = pkgs.writeText "mysql_init.sql" ''
49+ CREATE DATABASE prosody;
50+ CREATE USER 'prosody'@'server' IDENTIFIED BY 'password123';
51+ GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'server';
52+ FLUSH PRIVILEGES;
53+ '';
54+ package = pkgs.mariadb;
55+ };
56+ };
57+ };
58+
59+ testScript = { nodes, ... }: ''
60+ $mysql->waitForUnit('mysql.service');
61+ $server->waitForUnit('prosody.service');
62+ $server->succeed('prosodyctl status') =~ /Prosody is running/;
63+
64+ # set password to 'nothunter2' (it's asked twice)
65+ $server->succeed('yes nothunter2 | prosodyctl adduser cthon98@example.com');
66+ # set password to 'y'
67+ $server->succeed('yes | prosodyctl adduser azurediamond@example.com');
68+ # correct password to 'hunter2'
69+ $server->succeed('yes hunter2 | prosodyctl passwd azurediamond@example.com');
70+
71+ $client->succeed("send-message");
72+
73+ $server->succeed('prosodyctl deluser cthon98@example.com');
74+ $server->succeed('prosodyctl deluser azurediamond@example.com');
75+ '';
76+}
77+
nixos/tests/xmpp/prosody.nixnew file+46
@@ -0,0 +1,46 @@
1+import ../make-test.nix {
2+ name = "prosody";
3+
4+ nodes = {
5+ client = { nodes, pkgs, ... }: {
6+ environment.systemPackages = [
7+ (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; })
8+ ];
9+ };
10+ server = { config, pkgs, ... }: {
11+ networking.extraHosts = ''
12+ ${config.networking.primaryIPAddress} example.com
13+ '';
14+ networking.firewall.enable = false;
15+ services.prosody = {
16+ enable = true;
17+ # TODO: use a self-signed certificate
18+ c2sRequireEncryption = false;
19+ extraConfig = ''
20+ storage = "sql"
21+ '';
22+ virtualHosts.test = {
23+ domain = "example.com";
24+ enabled = true;
25+ };
26+ };
27+ };
28+ };
29+
30+ testScript = { nodes, ... }: ''
31+ $server->waitForUnit('prosody.service');
32+ $server->succeed('prosodyctl status') =~ /Prosody is running/;
33+
34+ # set password to 'nothunter2' (it's asked twice)
35+ $server->succeed('yes nothunter2 | prosodyctl adduser cthon98@example.com');
36+ # set password to 'y'
37+ $server->succeed('yes | prosodyctl adduser azurediamond@example.com');
38+ # correct password to 'hunter2'
39+ $server->succeed('yes hunter2 | prosodyctl passwd azurediamond@example.com');
40+
41+ $client->succeed("send-message");
42+
43+ $server->succeed('prosodyctl deluser cthon98@example.com');
44+ $server->succeed('prosodyctl deluser azurediamond@example.com');
45+ '';
46+}
nixos/tests/xmpp-sendmessage.nix → nixos/tests/xmpp/xmpp-sendmessage.nixrenamed

The content is the same.

pkgs/top-level/all-packages.nix+1
@@ -14508,6 +14508,7 @@ in
1450814508 prosody = callPackage ../servers/xmpp/prosody {
1450914509 # _compat can probably be removed on next minor version after 0.10.0
1451014510 lua5 = lua5_2_compat;
14511+ withExtraLibs = [ luaPackages.luadbi-sqlite3 ];
1451114512 inherit (lua52Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luadbi;
1451214513 };
1451314514