Merge pull request avocado-framework#5885 from sunqingwei811/master

Signed-off-by: Jan Richter <[email protected]>
richtja · Mar 25, 2024 · e2755cb · e2755cb
2 parents 7af2ffc + 8cb7135
commit e2755cb
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/avocado/utils/disk.py b/avocado/utils/disk.py
@@ -121,8 +121,14 @@ def get_disks():
     :returns: a list of paths to the physical disks on the system
     :rtype: list of str
     """
-    json_result = process.run("lsblk --json --paths --inverse")
-    json_data = json.loads(json_result.stdout_text)
+    try:
+        json_result = process.run("lsblk --json --paths --inverse")
+    except process.CmdError as ce:
+        raise DiskError(f"Error occurred while executing lsblk command: {ce}")
+    try:
+        json_data = json.loads(json_result.stdout_text)
+    except json.JSONDecodeError as je:
+        raise DiskError(f"Error occurred while parsing JSON data: {je}")
     disks = []
     for device in json_data["blockdevices"]:
         disks.append(device["name"])