resolving some comments on naming

canonical · Sep 14, 2024 · 8638b50 · 8638b50
1 parent 89640bd
commit 8638b50
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 22 deletions.
diff --git a/tests/checkbox/checkbox-provider-tdx/units/tests/jobs.pxu b/tests/checkbox/checkbox-provider-tdx/units/tests/jobs.pxu
@@ -81,7 +81,7 @@ requires:
   executable.name == 'qemu-system-x86_64'
 command:
   export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH
-  setup-env-and-run test_multiple_boot.py
+  setup-env-and-run test_boot_multiple.py
 
 id: tdx-stress/td-resource-limits
 category_id: tdx-stress
@@ -93,7 +93,7 @@ requires:
   executable.name == 'qemu-system-x86_64'
 command:
   export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH
-  setup-env-and-run test_resource_limits.py
+  setup-env-and-run test_stress_resources.py
 
 #id: tdx-stress/td-stress-boot
 #category_id: tdx-stress
@@ -129,7 +129,7 @@ requires:
   executable.name == 'qemu-system-x86_64'
 command:
   export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH
-  setup-env-and-run test_multiple_boot.py
+  setup-env-and-run test_boot_multiple.py
 
 id: tdx-guest/td-guest-report
 category_id: tdx-guest

diff --git a/tests/tests/test_boot_basic.py b/tests/tests/test_boot_basic.py
@@ -47,7 +47,6 @@ def test_early_printk():
     qm.qcmd.plugins['boot'].append = "earlyprintk=ttyS0,115200"
     qm.run()
 
-    mon = Qemu.QemuMonitor(qm)
-    mon.wait_for_state('running')
+    ssh = Qemu.QemuSSH(qm)
 
     qm.stop()
diff --git a/tests/tests/test_multiple_boot.py → tests/tests/test_boot_multiple.py b/tests/tests/test_multiple_boot.py → tests/tests/test_boot_multiple.py
@@ -28,12 +28,9 @@ def test_4vcpus_1socket_10times():
     qm = Qemu.QemuMachine()
     qm.qcmd.plugins['cpu'].nb_cores = 4
 
-    Qemu.QemuMonitor.CONNECT_RETRIES = 10
-
     for i in range(0,10):
         qm.run()
-        mon = Qemu.QemuMonitor(qm)
-        mon.wait_for_state('running')
+        ssh = Qemu.QemuSSH(qm)
         qm.stop()
 
 
@@ -46,10 +43,7 @@ def test_4vcpus_2sockets_5times():
     qm.qcmd.plugins['cpu'].nb_cores = 4
     qm.qcmd.plugins['cpu'].nb_sockets = 2
 
-    Qemu.QemuMonitor.CONNECT_RETRIES = 10
-
     for i in range(0,5):
         qm.run()
-        mon = Qemu.QemuMonitor(qm)
-        mon.wait_for_state('running')
+        ssh = Qemu.QemuSSH(qm)
         qm.stop()
diff --git a/tests/tests/test_quote_configfs_tsm.py b/tests/tests/test_quote_configfs_tsm.py
@@ -19,6 +19,7 @@
 import time
 
 import Qemu
+from common import deploy_and_setup
 
 script_path=os.path.dirname(os.path.realpath(__file__))
 
@@ -47,9 +48,6 @@ def test_qgs_socket():
     qm = Qemu.QemuMachine()
     qm.run()
 
-    mon = Qemu.QemuMonitor(qm)
-    mon.wait_for_state('running')
-
     # do basic tsm_config test on guest
     ssh = Qemu.QemuSSH(qm)
     ssh.rsync_file(f'{script_path}/../lib', '/tmp/tdxtest/')

diff --git a/tests/tests/test_resource_limits.py → tests/tests/test_stress_resources.py b/tests/tests/test_resource_limits.py → tests/tests/test_stress_resources.py
@@ -34,8 +34,7 @@ def test_huge_resource_vm():
     qm.qcmd.plugins['memory'].memory = '%dG' % (huge_mem_gb)
     qm.run()
 
-    mon = Qemu.QemuMonitor(qm)
-    mon.wait_for_state('running')
+    ssh = Qemu.QemuSSH(qm)
 
     qm.stop()
 
@@ -52,8 +51,7 @@ def test_max_vcpus():
     qm.qcmd.plugins['cpu'].nb_cores = num_cpus
     qm.run()
 
-    mon = Qemu.QemuMonitor(qm)
-    mon.wait_for_state('running')
+    ssh = Qemu.QemuSSH(qm)
 
     qm.stop()
 
@@ -79,8 +77,7 @@ def test_max_guests():
     # wait for all machines running
     for i in range(max_td_vms):
         print("Waiting for machine %d" % (i))
-        mon = Qemu.QemuMonitor(qm[i])
-        mon.wait_for_state('running')
+        ssh = Qemu.QemuSSH(qm[i])
 
     # stop all machines
     for i in range(max_td_vms):