testscript: use self.assert*()-helpers more (raise exception)

Better to get more context when things fail.

On-behalf-of: SAP philipp.schuster@sap.com
Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de>

Author: phip1611

tests/testscript.py

@@ -640,18 +640,18 @@ def test_numa_topology(self):
 
         # Check that there are 2 NUMA nodes
         status, _ = ssh(controllerVM, "ls /sys/devices/system/node/node0")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         status, _ = ssh(controllerVM, "ls /sys/devices/system/node/node1")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         # Check that there are 2 CPU sockets and 2 threads per core
         status, out = ssh(controllerVM, "lscpu | grep Socket | awk '{print $2}'")
-        assert status == 0, "cmd failed"
+        self.assertEqual(status, 0)
         assert int(out) == 2, "Expect to find 2 sockets"
 
         status, out = ssh(controllerVM, "lscpu | grep Thread\\( | awk '{print $4}'")
-        assert status == 0, "cmd failed"
+        self.assertEqual(status, 0)
         assert int(out) == 2, "Expect to find 2 threads per core"
 
     def test_cirros_image(self):
@@ -711,10 +711,10 @@ def test_numa_hugepages(self):
 
         # Check that there are 2 NUMA nodes
         status, _ = ssh(controllerVM, "ls /sys/devices/system/node/node0")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         status, _ = ssh(controllerVM, "ls /sys/devices/system/node/node1")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         # Check that we really use hugepages from the hugepage pool
         status, out = controllerVM.execute(
@@ -735,10 +735,10 @@ def test_numa_hugepages_prefault(self):
 
         # Check that there are 2 NUMA nodes
         status, _ = ssh(controllerVM, "ls /sys/devices/system/node/node0")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         status, _ = ssh(controllerVM, "ls /sys/devices/system/node/node1")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         # Check that all huge pages are in use
         status, out = controllerVM.execute(
@@ -793,7 +793,7 @@ def test_managedsave(self):
         wait_for_ssh(controllerVM)
 
         status, _ = ssh(controllerVM, "ls /tmp/foo")
-        assert status == 0
+        self.assertEqual(status, 0)
 
     def test_shutdown(self):
         """
@@ -1022,7 +1022,7 @@ def test_live_migration_virsh_non_blocking(self):
 
         # Stress the CH VM in order to make the migration take longer
         status, _ = ssh(controllerVM, "screen -dmS stress stress -m 4 --vm-bytes 400M")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         # Do migration in a screen session and detach
         controllerVM.succeed(
@@ -1118,7 +1118,7 @@ def test_disk_resize_raw(self):
         )
         disk_size_host = controllerVM.succeed("ls /tmp/disk.img -l | awk '{print $5}'")
 
-        assert status == 0
+        self.assertEqual(status, 0)
         assert int(disk_size_guest) == disk_size_bytes_100M
         assert int(disk_size_host) == disk_size_bytes_100M
 
@@ -1132,7 +1132,7 @@ def test_disk_resize_raw(self):
         )
         disk_size_host = controllerVM.succeed("ls /tmp/disk.img -l | awk '{print $5}'")
 
-        assert status == 0
+        self.assertEqual(status, 0)
         assert int(disk_size_guest) == disk_size_bytes_10M
         assert int(disk_size_host) == disk_size_bytes_10M
 
@@ -1146,7 +1146,7 @@ def test_disk_resize_raw(self):
         )
         disk_size_host = controllerVM.succeed("ls /tmp/disk.img -l | awk '{print $5}'")
 
-        assert status == 0
+        self.assertEqual(status, 0)
         assert int(disk_size_guest) == disk_size_bytes_200M
         assert int(disk_size_host) == disk_size_bytes_200M
 
@@ -1160,7 +1160,7 @@ def test_disk_resize_raw(self):
         )
         disk_size_host = controllerVM.succeed("ls /tmp/disk.img -l | awk '{print $5}'")
 
-        assert status == 0
+        self.assertEqual(status, 0)
         assert int(disk_size_guest) == disk_size_bytes_100M
         assert int(disk_size_host) == disk_size_bytes_100M
 
@@ -1173,7 +1173,7 @@ def test_disk_resize_raw(self):
         )
         disk_size_host = controllerVM.succeed("ls /tmp/disk.img -l | awk '{print $5}'")
 
-        assert status == 0
+        self.assertEqual(status, 0)
         assert int(disk_size_guest) == disk_size_bytes_100M
         assert int(disk_size_host) == disk_size_bytes_100M
 
@@ -1234,7 +1234,7 @@ def test_disk_resize_qcow2(self):
             controllerVM, "lsblk --raw -b /dev/vdb | awk '{print $4}' | tail -n1"
         )
 
-        assert status == 0
+        self.assertEqual(status, 0)
         assert int(disk_size_guest) == disk_size_bytes_100M
 
         controllerVM.fail(
@@ -1335,7 +1335,7 @@ def test_live_migration_kill_chv_on_sender_side(self):
 
         # Stress the CH VM in order to make the migration take longer
         status, _ = ssh(controllerVM, "screen -dmS stress stress -m 4 --vm-bytes 400M")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         # Do migration in a screen session and detach
         controllerVM.succeed(
@@ -1373,7 +1373,7 @@ def test_live_migration_kill_chv_on_receiver_side(self):
 
         # Stress the CH VM in order to make the migration take longer
         status, _ = ssh(controllerVM, "screen -dmS stress stress -m 4 --vm-bytes 400M")
-        assert status == 0
+        self.assertEqual(status, 0)
 
         # Do migration in a screen session and detach
         controllerVM.succeed(
@@ -2024,7 +2024,8 @@ def number_of_devices(machine: Machine, filter: str = "") -> int:
     else:
         cmd = f"lspci -n | grep {filter} | wc -l"
     status, out = ssh(machine, cmd)
-    assert status == 0
+    if status != 0:
+        raise RuntimeError("failed to query the number of PCI devices from the guest")
     return int(out)
 
 
@@ -2129,7 +2130,10 @@ def pci_devices_by_bdf(machine: Machine):
         machine,
         "lspci -n | awk '/^[0-9a-f]{2}:[0-9a-f]{2}\\.[0-9]/{bdf=$1}{class=$3} {print bdf \",\" class}'",
     )
-    assert status == 0
+    if status != 0:
+        raise RuntimeError(
+            "failed to get PCI devices grouped by their BDF from the guest"
+        )
     out = {}
     for line in lines.splitlines():
         bdf, device_class = line.split(",")