diff options
| author | Félix Baylac-Jacqué <felix@alternativebit.fr> | 2022-11-23 11:05:12 +0100 |
|---|---|---|
| committer | Félix Baylac-Jacqué <felix@alternativebit.fr> | 2022-11-23 11:05:12 +0100 |
| commit | 8040c468ed9188c33fb851921327d9d9d6850f2c (patch) | |
| tree | 4e3d072a8a03089821024b2116cab1b479751617 /nixos/tests/xmpp | |
| parent | 501d684de8fb70cac2e72eaaff0dcc94aa2af459 (diff) | |
nixosTests/prosody[-mysql]: fix tests TLS setup
The tests TLS setup was bogus: the xmpp-send-message script was trying to connect to the server through a bogus domain name. Injecting the right one. I'm a bit confused about that one. I know for sure this NixOS test succeeded last time I checked it, but the TLS conf is bogus for sure. I assume the slixmpp SNI validation was a bit too loose and was tightened at some point.
Diffstat (limited to 'nixos/tests/xmpp')
| -rw-r--r-- | nixos/tests/xmpp/prosody.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/xmpp/xmpp-sendmessage.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/tests/xmpp/prosody.nix b/nixos/tests/xmpp/prosody.nix index 14eab56fb821f..045ae6430fd48 100644 --- a/nixos/tests/xmpp/prosody.nix +++ b/nixos/tests/xmpp/prosody.nix @@ -42,7 +42,7 @@ in import ../make-test-python.nix { ${nodes.server.config.networking.primaryIPAddress} uploads.example.com ''; environment.systemPackages = [ - (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) + (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = "example.com"; }) ]; }; server = { config, pkgs, ... }: { @@ -82,6 +82,7 @@ in import ../make-test-python.nix { testScript = { nodes, ... }: '' # Check with sqlite storage + start_all() server.wait_for_unit("prosody.service") server.succeed('prosodyctl status | grep "Prosody is running"') diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 781cd55c0766e..8ccac06124913 100644 --- a/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -82,7 +82,7 @@ if __name__ == '__main__': ct.register_plugin('xep_0363') # MUC ct.register_plugin('xep_0045') - ct.connect(("server", 5222)) + ct.connect(("${connectTo}", 5222)) ct.process(forever=False) if not ct.test_succeeded: |