qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] tests/acceptance: fix timeout for vm.wait


From: John Snow
Subject: Re: [PATCH] tests/acceptance: fix timeout for vm.wait
Date: Tue, 1 Dec 2020 14:15:26 -0500
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1

On 11/16/20 6:13 AM, Philippe Mathieu-Daudé wrote:
Cc'ing John.

On Mon, Nov 16, 2020 at 11:08 AM Pavel Dovgalyuk
<pavel.dovgalyuk@ispras.ru> wrote:

This patch adds timeout parameter to vm.wait() calls, because the default
value is just 30 seconds, and tests may last for more time.


This doesn't sound right -- the timeout isn't meant to be for the entire duration of the test, the timeout is from the time of issuing a shutdown command until the time the VM actually shuts down. Ideally, that should not take a particularly long time in a well-behaved test.

Why is it lasting longer than 30 seconds?
How long is it actually taking, do we know?

And, are you SURE you want to have *no* timeout for all of these calls? (Will something else kill them if they take too long? Ideally before gitlab itself kills the job for running too long?)

Cleber?

Signed-off-by: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
---
  tests/acceptance/boot_linux_console.py |    8 ++++----
  tests/acceptance/replay_kernel.py      |    2 +-
  2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/acceptance/boot_linux_console.py 
b/tests/acceptance/boot_linux_console.py
index cb6086ca6f..1cb8cb7a2a 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -208,7 +208,7 @@ class BootLinuxConsole(LinuxKernelTest):
          exec_command_and_wait_for_pattern(self, 'reboot',
                                                  'reboot: Restarting system')
          # Wait for VM to shut down gracefully
-        self.vm.wait()
+        self.vm.wait(None)

      @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
      def test_mips64el_malta_5KEc_cpio(self):
@@ -250,7 +250,7 @@ class BootLinuxConsole(LinuxKernelTest):
          exec_command_and_wait_for_pattern(self, 'reboot',
                                                  'reboot: Restarting system')
          # Wait for VM to shut down gracefully
-        self.vm.wait()
+        self.vm.wait(None)

      def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash):
          kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
@@ -725,7 +725,7 @@ class BootLinuxConsole(LinuxKernelTest):
          exec_command_and_wait_for_pattern(self, 'reboot',
                                                  'reboot: Restarting system')
          # Wait for VM to shut down gracefully
-        self.vm.wait()
+        self.vm.wait(None)

      @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
                  'Test artifacts fetched from unreliable apt.armbian.com')
@@ -778,7 +778,7 @@ class BootLinuxConsole(LinuxKernelTest):
          exec_command_and_wait_for_pattern(self, 'reboot',
                                                  'reboot: Restarting system')
          # Wait for VM to shut down gracefully
-        self.vm.wait()
+        self.vm.wait(None)

      @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
                  'Test artifacts fetched from unreliable dl.armbian.com')
diff --git a/tests/acceptance/replay_kernel.py 
b/tests/acceptance/replay_kernel.py
index c8b043ac31..02a52b1d72 100644
--- a/tests/acceptance/replay_kernel.py
+++ b/tests/acceptance/replay_kernel.py
@@ -60,7 +60,7 @@ class ReplayKernelBase(LinuxKernelTest):
              logger.info('finished the recording with log size %s bytes'
                          % os.path.getsize(replay_path))
          else:
-            vm.wait()
+            vm.wait(None)
              logger.info('successfully finished the replay')
          elapsed = time.time() - start_time
          logger.info('elapsed time %.2f sec' % elapsed)






reply via email to

[Prev in Thread] Current Thread [Next in Thread]