From 75047877e34a94a51755a9639ac92de31d0ce39a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 9 Apr 2021 13:51:24 +0200
Subject: [PATCH] nixos/tests/home-assistant: fix mosquitto configuration
Things broke after mosquitto was upgraded in f07c81b.
---
nixos/tests/home-assistant.nix | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 726c7eb6acb..3b7295324a1 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -14,9 +14,10 @@ in {
environment.systemPackages = with pkgs; [ mosquitto ];
services.mosquitto = {
enable = true;
+ checkPasswords = true;
users = {
"${mqttUsername}" = {
- acl = [ "pattern readwrite #" ];
+ acl = [ "topic readwrite #" ];
password = mqttPassword;
};
};
@@ -77,12 +78,9 @@ in {
hass.wait_for_open_port(8123)
hass.succeed("curl --fail http://localhost:8123/lovelace")
with subtest("Toggle a binary sensor using MQTT"):
- # wait for broker to become available
- hass.wait_until_succeeds(
- "mosquitto_sub -V mqttv311 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -W 1 -t '*'"
- )
+ hass.wait_for_open_port(1883)
hass.succeed(
- "mosquitto_pub -V mqttv311 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -m let_there_be_light"
+ "mosquitto_pub -V mqttv5 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -m let_there_be_light"
)
with subtest("Print log to ease debugging"):
output_log = hass.succeed("cat ${configDir}/home-assistant.log")