ras/hwinfo.py:Fix false positive cases, redundancy

Added check to "--save-config SPEC" test to FAIL when hwinfo fails to save the configuration file Added check to "--show-config SPEC" test to CANCEL when there is no saved configuration file present Removed reduntant self.log(..) function wherever necessary Added "=all" to "--save-config" self.fail() message to make it more meaningful Signed-off-by: Misbah Anjum N <[email protected]>
avocado-framework-tests · Mar 19, 2024 · 249203d · 249203d
1 parent 8491445
commit 249203d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/ras/hwinfo.py b/ras/hwinfo.py
@@ -28,7 +28,6 @@ def clear_dmesg(self):
     def run_cmd(self, cmd):
         self.log.info("executing ============== %s =================" % cmd)
         if process.system(cmd, ignore_status=True, sudo=True):
-            self.log.info("%s command failed" % cmd)
             self.fail("hwinfo: %s command failed to execute" % cmd)
 
     def setUp(self):
@@ -55,17 +54,24 @@ def test_disk(self):
 
     def test_unique_id_save(self):
         self.run_cmd("hwinfo --disk --save-config %s" % self.Unique_Id)
+        if "failed" in process.system_output("hwinfo --disk --save-config %s"
+                                             % self.Unique_Id,
+                                             shell=True).decode("utf-8"):
+            self.fail("hwinfo: --save-config UDI option failed")
 
     def test_unique_id_show(self):
         self.run_cmd("hwinfo --disk --show-config %s" % self.Unique_Id)
+        if "No config" in process.system_output("hwinfo --disk --show-config %s"
+                                                % self.Unique_Id,
+                                                shell=True).decode("utf-8"):
+            self.cancel("hwinfo: --save-config UDI cancelled, no saved config present")
 
     def test_verbose_map(self):
         self.run_cmd("hwinfo --verbose --map")
 
     def test_log_file(self):
         self.run_cmd("hwinfo --all --log FILE")
         if (not os.path.exists('./FILE')) or (os.stat("FILE").st_size == 0):
-            self.log.info("--log option failed")
             self.fail("hwinfo: failed with --log option")
 
     def test_dump_0(self):
@@ -90,5 +96,5 @@ def test_save_config(self):
         self.run_cmd("hwinfo --disk --save-config=all")
         if "failed" in process.system_output("hwinfo --disk --save-config=all",
                                              shell=True).decode("utf-8"):
-            self.log.info("--save-config option failed")
-            self.fail("hwinfo: --save-config option failed")
+            self.fail("hwinfo: --save-config=all option failed")
+