BootLinuxSshTest: Only run the tests when explicitly requested

Currently the Avocado framework does not distinct the time spent
downloading assets vs. the time spent running a test. With big
assets (like a full VM image) the tests likely fail.

This is a limitation known by the Avocado team.
Until this issue get fixed, do not run this tests automatically.

Tests can still be run setting the AVOCADO_TIMEOUT_EXPECTED
environment variable.

Reported-by: Gerd Hoffmann <kraxel@redhat.com>
Reported-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Message-Id: <20190918122748.2144-1-philmd@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-09-18 14:27:48 +02:00 committed by Cleber Rosa
parent ab486ea9f4
commit 471c97a693

View File

@ -12,7 +12,7 @@ import logging
import paramiko import paramiko
import time import time
from avocado import skipIf from avocado import skipUnless
from avocado_qemu import Test from avocado_qemu import Test
from avocado.utils import process from avocado.utils import process
from avocado.utils import archive from avocado.utils import archive
@ -171,7 +171,7 @@ class LinuxSSH(Test):
self.run_common_commands() self.run_common_commands()
self.shutdown_via_ssh() self.shutdown_via_ssh()
@skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
def test_mips_malta32eb_kernel3_2_0(self): def test_mips_malta32eb_kernel3_2_0(self):
""" """
:avocado: tags=arch:mips :avocado: tags=arch:mips
@ -186,7 +186,7 @@ class LinuxSSH(Test):
self.check_mips_malta('be', kernel_path, 'mips') self.check_mips_malta('be', kernel_path, 'mips')
@skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
def test_mips_malta32el_kernel3_2_0(self): def test_mips_malta32el_kernel3_2_0(self):
""" """
:avocado: tags=arch:mipsel :avocado: tags=arch:mipsel
@ -201,7 +201,7 @@ class LinuxSSH(Test):
self.check_mips_malta('le', kernel_path, 'mips') self.check_mips_malta('le', kernel_path, 'mips')
@skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
def test_mips_malta64eb_kernel3_2_0(self): def test_mips_malta64eb_kernel3_2_0(self):
""" """
:avocado: tags=arch:mips64 :avocado: tags=arch:mips64
@ -215,7 +215,7 @@ class LinuxSSH(Test):
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
self.check_mips_malta('be', kernel_path, 'mips64') self.check_mips_malta('be', kernel_path, 'mips64')
@skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI') @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout')
def test_mips_malta64el_kernel3_2_0(self): def test_mips_malta64el_kernel3_2_0(self):
""" """
:avocado: tags=arch:mips64el :avocado: tags=arch:mips64el