From 027ffa983fd1c44042ce53c73a6794e8741f2f71 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Mon, 15 Feb 2021 03:05:00 +0100 Subject: [PATCH] Update tests --- test/test_colors.tavern.yaml | 8 +- test/test_label.tavern.yaml | 166 ++++++++++++++++---------------- test/test_mqtt.tavern.yaml | 38 ++++---- test/test_obj.tavern.yaml | 58 +++++------ test/test_value_str.tavern.yaml | 6 +- 5 files changed, 133 insertions(+), 143 deletions(-) diff --git a/test/test_colors.tavern.yaml b/test/test_colors.tavern.yaml index 569dff13..9aefdd4d 100644 --- a/test/test_colors.tavern.yaml +++ b/test/test_colors.tavern.yaml @@ -81,7 +81,7 @@ stages: mqtt_response: topic: hasp/{plate}/state/page payload: "1" - timeout: 5 + timeout: 1 delay_after: 0 - name: Set bg_color @@ -125,7 +125,7 @@ stages: r: "{r}" g: "{g}" b: "{b}" - timeout: 5 + timeout: 1 - name: Reset mqtt_publish: @@ -144,7 +144,7 @@ stages: r: "{r}" g: "{g}" b: "{b}" - timeout: 5 + timeout: 1 - name: Reset mqtt_publish: @@ -163,4 +163,4 @@ stages: r: "{r}" g: "{g}" b: "{b}" - timeout: 5 + timeout: 1 diff --git a/test/test_label.tavern.yaml b/test/test_label.tavern.yaml index 48a4ce44..fa995d2b 100644 --- a/test/test_label.tavern.yaml +++ b/test/test_label.tavern.yaml @@ -22,7 +22,7 @@ stages: mqtt_response: topic: hasp/{plate}/state/page payload: "1" - timeout: 5 + timeout: 1 delay_after: 0.1 - name: Clear page @@ -42,305 +42,305 @@ stages: - name: Set x mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].x=50" + payload: "p1b1.x=50" delay_after: 0.1 - name: Get x mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].x" + payload: "p1b1.x" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - x: "50" - timeout: 5 + x: 50 + timeout: 1 - name: Set x mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].x=25" + payload: "p1b1.x=25" - name: Get x mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].x" + payload: "p1b1.x" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - x: "25" - timeout: 5 + x: 25 + timeout: 1 - name: Set y mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].y=50" + payload: "p1b1.y=50" delay_after: 0.1 - name: Get y mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].y" + payload: "p1b1.y" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - y: "50" - timeout: 5 + y: 50 + timeout: 1 - name: Set y mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].y=25" + payload: "p1b1.y=25" delay_after: 0.1 - name: Get y mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].y" + payload: "p1b1.y" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - y: "25" - timeout: 5 + y: 25 + timeout: 1 - name: Set w mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].w=50" + payload: "p1b1.w=50" delay_after: 0.1 - name: Get w mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].w" + payload: "p1b1.w" mqtt_response: topic: hasp/{plate}/state/p1b1 json: w: !anything - timeout: 5 + timeout: 1 - name: Set w mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].w=25" + payload: "p1b1.w=25" - name: Get w mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].w" + payload: "p1b1.w" mqtt_response: topic: hasp/{plate}/state/p1b1 json: w: !anything - timeout: 5 + timeout: 1 - name: Set h mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].h=50" + payload: "p1b1.h=50" delay_after: 0.1 - name: Get h mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].h" + payload: "p1b1.h" mqtt_response: topic: hasp/{plate}/state/p1b1 json: h: !anything - timeout: 5 + timeout: 1 - name: Set h mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].h=25" + payload: "p1b1.h=25" delay_after: 0.1 - name: Get h mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].h" + payload: "p1b1.h" mqtt_response: topic: hasp/{plate}/state/p1b1 json: h: !anything - timeout: 5 + timeout: 1 - name: Set mode mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].mode=crop" + payload: "p1b1.mode=crop" delay_after: 0.1 - name: Get mode mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].mode" + payload: "p1b1.mode" - name: Set w mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].w=50" + payload: "p1b1.w=50" delay_after: 0.1 - name: Get w mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].w" + payload: "p1b1.w" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - w: "50" - timeout: 5 + w: 50 + timeout: 1 - name: Set w mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].w=25" + payload: "p1b1.w=25" - name: Get w mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].w" + payload: "p1b1.w" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - w: "25" - timeout: 5 + w: 25 + timeout: 1 - name: Set h mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].h=50" + payload: "p1b1.h=50" delay_after: 0.1 - name: Get h mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].h" + payload: "p1b1.h" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - h: "50" - timeout: 5 + h: 50 + timeout: 1 - name: Set h mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].h=45" + payload: "p1b1.h=45" delay_after: 0.1 - name: Get h mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].h" + payload: "p1b1.h" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - h: "45" - timeout: 5 + h: 45 + timeout: 1 - name: Set enabled mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].enabled=0" + payload: "p1b1.enabled=0" delay_after: 0.1 - name: Get enabled mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].enabled" + payload: "p1b1.enabled" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - enabled: "0" - timeout: 5 + enabled: 0 + timeout: 1 - name: Set enabled mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].enabled=1" + payload: "p1b1.enabled=1" delay_after: 0.1 - name: Get enabled mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].enabled" + payload: "p1b1.enabled" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - enabled: "1" - timeout: 5 + enabled: 1 + timeout: 1 - name: Set hidden mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].hidden=1" + payload: "p1b1.hidden=1" delay_after: 0.1 - name: Get hidden mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].hidden" + payload: "p1b1.hidden" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - hidden: "1" - timeout: 5 + hidden: 1 + timeout: 1 - name: Get vis mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].vis" + payload: "p1b1.vis" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - vis: "0" - timeout: 5 + vis: 0 + timeout: 1 - name: Set hidden mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].hidden=0" + payload: "p1b1.hidden=0" delay_after: 0.1 - name: Get hidden mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].hidden" + payload: "p1b1.hidden" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - hidden: "0" - timeout: 5 + hidden: 0 + timeout: 1 - name: Get vis mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].vis" + payload: "p1b1.vis" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - vis: "1" - timeout: 5 + vis: 1 + timeout: 1 - name: Set vis mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].vis=0" + payload: "p1b1.vis=0" delay_after: 0.1 - name: Get hidden mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].hidden" + payload: "p1b1.hidden" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - hidden: "1" - timeout: 5 + hidden: 1 + timeout: 1 - name: Get vis mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].vis" + payload: "p1b1.vis" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - vis: "0" - timeout: 5 + vis: 0 + timeout: 1 - name: Set vis mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].vis=1" + payload: "p1b1.vis=1" delay_after: 0.1 - name: Get hidden mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].hidden" + payload: "p1b1.hidden" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - hidden: "0" - timeout: 5 + hidden: 0 + timeout: 1 - name: Get vis mqtt_publish: topic: hasp/{plate}/command - payload: "p[1].b[1].vis" + payload: "p1b1.vis" mqtt_response: topic: hasp/{plate}/state/p1b1 json: - vis: "1" - timeout: 5 + vis: 1 + timeout: 1 diff --git a/test/test_mqtt.tavern.yaml b/test/test_mqtt.tavern.yaml index 18c220af..2e103523 100644 --- a/test/test_mqtt.tavern.yaml +++ b/test/test_mqtt.tavern.yaml @@ -23,8 +23,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/page payload: "1" - timeout: 5 - delay_after: 1 + timeout: 1 + delay_after: 0 - name: step 2 - Page test mqtt_publish: topic: hasp/{plate}/command @@ -32,8 +32,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/page payload: "2" - timeout: 5 - delay_after: 1 + timeout: 1 + delay_after: 0 - name: step 3 - Page test mqtt_publish: topic: hasp/{plate}/command @@ -41,26 +41,26 @@ stages: mqtt_response: topic: hasp/{plate}/state/page payload: "3" - timeout: 5 - delay_after: 1 + timeout: 1 + delay_after: 0 - name: step 4 - Page test mqtt_publish: topic: hasp/{plate}/command/json - payload: "[\"page=0\"]" + payload: "[\"page=1\"]" mqtt_response: topic: hasp/{plate}/state/page - payload: "0" - timeout: 3 - delay_after: 1 + payload: "1" + timeout: 1 + delay_after: 0 - name: step 5 - Page test mqtt_publish: topic: hasp/{plate}/command/json payload: "[\"page 300\"]" mqtt_response: topic: hasp/{plate}/state/page - payload: "0" - timeout: 3 - delay_after: 1 + payload: "1" + timeout: 1 + delay_after: 0 --- test_name: Reboot Command @@ -75,7 +75,7 @@ paho-mqtt: connect: host: "{host}" port: !int "{port:d}" - timeout: 3 + timeout: 1 stages: - name: Test reboot command @@ -86,7 +86,7 @@ stages: topic: hasp/{plate}/LWT payload: "offline" timeout: 20 - delay_after: 1 + delay_after: 0 --- test_name: Idle States @@ -112,7 +112,7 @@ stages: topic: hasp/{plate}/state/idle payload: "LONG" timeout: 190 - delay_after: 1 + delay_after: 0 - name: Test idle mqtt_publish: @@ -122,7 +122,7 @@ stages: topic: hasp/{plate}/state/idle payload: "SHORT" timeout: 70 - delay_after: 1 + delay_after: 0 - name: Test idle mqtt_publish: @@ -131,5 +131,5 @@ stages: mqtt_response: topic: hasp/{plate}/state/idle payload: "OFF" - timeout: 3 - delay_after: 1 + timeout: 1 + delay_after: 0 diff --git a/test/test_obj.tavern.yaml b/test/test_obj.tavern.yaml index 032621a3..6738952c 100644 --- a/test/test_obj.tavern.yaml +++ b/test/test_obj.tavern.yaml @@ -35,17 +35,7 @@ marks: vals: - 10 - 12 - - 20 - - 22 - - 30 - - 31 - - 32 - - 33 - - 40 - - 41 - - 50 - - 51 - - 91 + stages: - name: Page 1 @@ -55,7 +45,7 @@ stages: mqtt_response: topic: hasp/{plate}/state/page payload: "1" - timeout: 5 + timeout: 1 delay_after: 0 - name: Clear page @@ -79,8 +69,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - x: "{x}" - timeout: 5 + x: !int "{x:d}" + timeout: 1 - name: Test y mqtt_publish: @@ -89,8 +79,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - y: "{y}" - timeout: 5 + y: !int "{y:d}" + timeout: 1 - name: Test w mqtt_publish: @@ -99,8 +89,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - w: "{w}" - timeout: 5 + w: !int "{w:d}" + timeout: 1 - name: Test h mqtt_publish: @@ -110,8 +100,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - h: "{h}" - timeout: 5 + h: !int "{h:d}" + timeout: 1 - name: Test enabled mqtt_publish: @@ -121,8 +111,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - enabled: "{hidden}" - timeout: 5 + enabled: !int "{hidden:d}" + timeout: 1 - name: Set vis mqtt_publish: @@ -136,8 +126,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - hidden: "{hidden_inv}" - timeout: 5 + hidden: !int "{hidden_inv:d}" + timeout: 1 - name: Get vis mqtt_publish: topic: hasp/{plate}/command @@ -145,8 +135,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - vis: "{hidden}" - timeout: 5 + vis: !int "{hidden:d}" + timeout: 1 - name: Set hidden mqtt_publish: @@ -160,8 +150,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - hidden: "{hidden}" - timeout: 5 + hidden: !int "{hidden:d}" + timeout: 1 - name: Get vis mqtt_publish: @@ -170,8 +160,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - vis: "{hidden_inv}" - timeout: 5 + vis: !int "{hidden_inv:d}" + timeout: 1 - name: Test opacity mqtt_publish: @@ -180,8 +170,8 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - opacity: "{opacity}" - timeout: 5 + opacity: !int "{opacity:d}" + timeout: 1 - name: Test radius mqtt_publish: @@ -190,5 +180,5 @@ stages: mqtt_response: topic: hasp/{plate}/state/p1b1 json: - radius: "{radius}" - timeout: 5 + radius: !int "{radius:d}" + timeout: 1 diff --git a/test/test_value_str.tavern.yaml b/test/test_value_str.tavern.yaml index a0cc6a4f..6b4fa323 100644 --- a/test/test_value_str.tavern.yaml +++ b/test/test_value_str.tavern.yaml @@ -81,14 +81,14 @@ stages: mqtt_response: topic: hasp/{plate}/state/page payload: "1" - timeout: 5 + timeout: 1 delay_after: 0 - name: Set value_str mqtt_publish: topic: "hasp/{plate}/command/p[1].b[1].value_str" payload: "{str1}{str2}" - delay_after: 0.2 + delay_after: 0.05 - name: Get value_str mqtt_publish: topic: hasp/{plate}/command @@ -97,4 +97,4 @@ stages: topic: hasp/{plate}/state/p1b1 json: value_str: "{str1}{str2}" - timeout: 5 + timeout: 1