Unverified Commit 8040c468 authored by Félix Baylac-Jacqué's avatar Félix Baylac-Jacqué
Browse files

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.
parent 501d684d

nixos/tests/xmpp/prosody.nix

+2 −1
Original line number Diff line number Diff line
@@ -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"')

nixos/tests/xmpp/xmpp-sendmessage.nix

+1 −1
Original line number Diff line number Diff line
@@ -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: