summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAlbin Suresh <albin.suresh@softwareag.com>2022-03-08 22:46:44 +0530
committerAlbin Suresh <albin.suresh@softwareag.com>2022-03-08 22:46:44 +0530
commit0593a9bae1ab1c164baef1bd9bc58a13cbd120b4 (patch)
treebafc2b6c6dc3c0560a0d6ffa9579d8abf6f6385a /tests
parentdd607148665cbaea265211f1442c7ec8e01cc604 (diff)
Closes #966 Cleanup logic for tedge_mapper_c8y_alarms pysys test
Clear all the raised alarms in the test cleanup
Diffstat (limited to 'tests')
-rw-r--r--tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/pysystest.xml1
-rw-r--r--tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/run.py27
2 files changed, 22 insertions, 6 deletions
diff --git a/tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/pysystest.xml b/tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/pysystest.xml
index 19c25560..ce166481 100644
--- a/tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/pysystest.xml
+++ b/tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/pysystest.xml
@@ -9,7 +9,6 @@
<![CDATA[ ]]>
</purpose>
</description>
- <skipped reason="#966 Test needs to be updated (not up to date with alarms mechanics)"/>
<classification>
<groups inherit="true">
<group>
diff --git a/tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/run.py b/tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/run.py
index 6321752f..fd3c5d0b 100644
--- a/tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/run.py
+++ b/tests/PySys/tedge_mapper_c8y/tedge_mapper_c8y_alarms/run.py
@@ -27,7 +27,7 @@ class TedgeMapperC8yAlarm(EnvironmentC8y):
self.startProcess(
command=self.tedge,
- arguments=["mqtt", "pub",
+ arguments=["mqtt", "pub", "-r",
"tedge/alarms/warning/temperature_high",
'{"message":"temperature is high", "time":"2021-12-15T15:22:06.464247777+05:30"}'],
environs=environ
@@ -36,7 +36,7 @@ class TedgeMapperC8yAlarm(EnvironmentC8y):
# Publish one temperature_high alarm with "MAJOR" severity to thin-edge device
self.startProcess(
command=self.tedge,
- arguments=["mqtt", "pub",
+ arguments=["mqtt", "pub", "-r",
"tedge/alarms/major/temperature_very_high",
'{"message":"temperature is very high"}'],
environs=environ
@@ -45,7 +45,7 @@ class TedgeMapperC8yAlarm(EnvironmentC8y):
# Publish one temperature_high alarm with "CRITICAL" severity to thin-edge device
self.startProcess(
command=self.tedge,
- arguments=["mqtt", "pub",
+ arguments=["mqtt", "pub", "-r",
"tedge/alarms/critical/temperature_dangerous",
'{"message":"temperature is dangerously high"}'],
environs=environ
@@ -54,7 +54,7 @@ class TedgeMapperC8yAlarm(EnvironmentC8y):
# Publish one temperature_high alarm with "MINOR" severity to thin-edge device
self.startProcess(
command=self.tedge,
- arguments=["mqtt", "pub",
+ arguments=["mqtt", "pub", "-r",
"tedge/alarms/minor/temperature_low",
'{"message":"temperature low"}'],
environs=environ
@@ -63,7 +63,7 @@ class TedgeMapperC8yAlarm(EnvironmentC8y):
# Clear the last "MINOR" alarm
self.startProcess(
command=self.tedge,
- arguments=["mqtt", "pub",
+ arguments=["mqtt", "pub", "-r",
"tedge/alarms/minor/temperature_low", ""],
environs=environ
)
@@ -102,4 +102,21 @@ class TedgeMapperC8yAlarm(EnvironmentC8y):
actual=alarm_json['type'], expected=expected_alarm_type)
def test_cleanup(self):
+ # Clear all previously raised alarms
+ self.startProcess(
+ command=self.tedge,
+ arguments=["mqtt", "pub", "-r",
+ "tedge/alarms/warning/temperature_high", ""],
+ )
+ self.startProcess(
+ command=self.tedge,
+ arguments=["mqtt", "pub", "-r",
+ "tedge/alarms/major/temperature_very_high", ""],
+ )
+ self.startProcess(
+ command=self.tedge,
+ arguments=["mqtt", "pub", "-r",
+ "tedge/alarms/critical/temperature_dangerous", ""],
+ )
+
self.cumulocity.clear_all_alarms_from_device(self.project.deviceid)