diff options
| author | pennae <github@quasiparticle.net> | 2022-10-26 19:21:33 +0200 |
|---|---|---|
| committer | pennae <82953136+pennae@users.noreply.github.com> | 2022-10-28 17:39:30 +0200 |
| commit | d55c393aa2364286c792ce6f7e67ea45ac6d1133 (patch) | |
| tree | 8de9080b3c43396d0eb5453f8b45a6f8e2013772 | |
| parent | 15372dc4d40d10cc0c3293e96730ba8363095e1d (diff) | |
| download | nixpkgs-d55c393aa2364286c792ce6f7e67ea45ac6d1133.tar nixpkgs-d55c393aa2364286c792ce6f7e67ea45ac6d1133.tar.gz nixpkgs-d55c393aa2364286c792ce6f7e67ea45ac6d1133.tar.bz2 nixpkgs-d55c393aa2364286c792ce6f7e67ea45ac6d1133.tar.lz nixpkgs-d55c393aa2364286c792ce6f7e67ea45ac6d1133.tar.xz nixpkgs-d55c393aa2364286c792ce6f7e67ea45ac6d1133.tar.zst nixpkgs-d55c393aa2364286c792ce6f7e67ea45ac6d1133.zip | |
nixos/mosquitto: fix test
looks like stricter typing checks broke this one?
| -rw-r--r-- | nixos/tests/mosquitto.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index d516d3373d9..70eecc89278 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -4,7 +4,7 @@ let port = 1888; tlsPort = 1889; anonPort = 1890; - bindTestPort = 1891; + bindTestPort = 18910; password = "VERY_secret"; hashedPassword = "$7$101$/WJc4Mp+I+uYE9sR$o7z9rD1EYXHPwEP5GqQj6A7k4W1yVbePlb8TqNcuOLV9WNCiDgwHOB0JHC1WCtdkssqTBduBNUnUGd6kmZvDSw=="; topic = "test/foo"; @@ -165,6 +165,10 @@ in { for t in threads: t.start() for t in threads: t.join() + def wait_uuid(uuid): + server.wait_for_console_text(uuid) + return None + start_all() server.wait_for_unit("mosquitto.service") @@ -203,14 +207,14 @@ in { parallel( lambda: client1.succeed(subscribe("-i 3688cdd7-aa07-42a4-be22-cb9352917e40", "reader")), lambda: [ - server.wait_for_console_text("3688cdd7-aa07-42a4-be22-cb9352917e40"), + wait_uuid("3688cdd7-aa07-42a4-be22-cb9352917e40"), client2.succeed(publish("-m test", "writer")) ]) parallel( lambda: client1.fail(subscribe("-i 24ff16a2-ae33-4a51-9098-1b417153c712", "reader")), lambda: [ - server.wait_for_console_text("24ff16a2-ae33-4a51-9098-1b417153c712"), + wait_uuid("24ff16a2-ae33-4a51-9098-1b417153c712"), client2.succeed(publish("-m test", "reader")) ]) @@ -229,7 +233,7 @@ in { lambda: client1.succeed(subscribe("-i fd56032c-d9cb-4813-a3b4-6be0e04c8fc3", "anonReader", port=${toString anonPort})), lambda: [ - server.wait_for_console_text("fd56032c-d9cb-4813-a3b4-6be0e04c8fc3"), + wait_uuid("fd56032c-d9cb-4813-a3b4-6be0e04c8fc3"), client2.succeed(publish("-m test", "anonWriter", port=${toString anonPort})) ]) ''; |