From 8e407fcc2b43a0cbbc6db8b205cc14be394d9825 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Sun, 5 Nov 2023 14:52:20 -0700 Subject: [PATCH] support/testing/tests/package/test_python_django.py: fix timeout calculation. timeout = 35 * self.emulator.timeout_multiplier [...] self.assertRunOk(cmd, timeout=timeout) Gets re-multiplied by self.emulator.timeout_multiplier in self.emulator.run(). Drop multiplying the timeout by self.emulator.timeout_multiplier to fix this issue. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit 9a81c7a7a4629cc009b05195c9b4e37a582287ea) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_python_django.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index 0b7d35bb6a..e1ca50f6d8 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -6,7 +6,7 @@ class TestPythonDjango(TestPythonPackageBase): sample_scripts = ["tests/package/sample_python_django.py"] def run_sample_scripts(self): - timeout = 35 * self.emulator.timeout_multiplier + timeout = 35 cmd = "cd /opt && /usr/bin/django-admin startproject testsite" self.assertRunOk(cmd, timeout=timeout)