diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2623f7cb2409..de00b68f3b87 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -676,7 +676,7 @@ in { ly = handleTest ./ly.nix {}; maddy = discoverTests (import ./maddy { inherit handleTest; }); maestral = handleTest ./maestral.nix {}; - magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {}; + magic-wormhole-mailbox-server = runTest ./magic-wormhole-mailbox-server.nix; magnetico = handleTest ./magnetico.nix {}; mailcatcher = runTest ./mailcatcher.nix; mailhog = handleTest ./mailhog.nix {}; diff --git a/nixos/tests/magic-wormhole-mailbox-server.nix b/nixos/tests/magic-wormhole-mailbox-server.nix index c6979db791f2..baf6d54564fb 100644 --- a/nixos/tests/magic-wormhole-mailbox-server.nix +++ b/nixos/tests/magic-wormhole-mailbox-server.nix @@ -1,47 +1,39 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "magic-wormhole-mailbox-server"; - meta = with pkgs.lib.maintainers; { - maintainers = [ mmahut ]; +{ lib, ... }: +{ + name = "magic-wormhole-mailbox-server"; + meta.maintainers = [ lib.maintainers.mmahut ]; + + nodes = { + server = { + networking.firewall.allowedTCPPorts = [ 4000 ]; + services.magic-wormhole-mailbox-server.enable = true; }; + client_alice = + { pkgs, ... }: + { + networking.firewall.enable = false; + environment.systemPackages = [ pkgs.magic-wormhole ]; + }; + client_bob = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.magic-wormhole ]; + }; + }; - nodes = { - server = - { ... }: - { - networking.firewall.allowedTCPPorts = [ 4000 ]; - services.magic-wormhole-mailbox-server.enable = true; - }; + testScript = '' + start_all() - client_alice = - { ... }: - { - networking.firewall.enable = false; - environment.systemPackages = [ pkgs.magic-wormhole ]; - }; + # Start the wormhole relay server + server.wait_for_unit("magic-wormhole-mailbox-server.service") + server.wait_for_open_port(4000) - client_bob = - { ... }: - { - environment.systemPackages = [ pkgs.magic-wormhole ]; - }; - }; + # Create a secret file and send it to Bob + client_alice.succeed("echo mysecret > secretfile") + client_alice.succeed("wormhole --relay-url=ws://server:4000/v1 send -0 secretfile >&2 &") - testScript = '' - start_all() - - # Start the wormhole relay server - server.wait_for_unit("magic-wormhole-mailbox-server.service") - server.wait_for_open_port(4000) - - # Create a secret file and send it to Bob - client_alice.succeed("echo mysecret > secretfile") - client_alice.succeed("wormhole --relay-url=ws://server:4000/v1 send -0 secretfile >&2 &") - - # Retrieve a secret file from Alice and check its content - client_bob.succeed("wormhole --relay-url=ws://server:4000/v1 receive -0 --accept-file") - client_bob.succeed("grep mysecret secretfile") - ''; - } -) + # Retrieve a secret file from Alice and check its content + client_bob.succeed("wormhole --relay-url=ws://server:4000/v1 receive -0 --accept-file") + client_bob.succeed("grep mysecret secretfile") + ''; +}