test: Adjust special cases for CentOS/RHEL 10

- Generalize the nginx skip (it's also not installed on
   centos-9-stream, we just never have started to test it there on our
   CI)
 - vdo and wireguard are not currently available in RHEL 10
 - NM team devices are not supported, see
   https://issues.redhat.com/browse/RHEL-33026
This commit is contained in:
Martin Pitt 2024-04-16 16:14:03 +02:00 committed by Martin Pitt
parent a41a3ca54c
commit ae44e9457f
8 changed files with 10 additions and 5 deletions

View File

@ -156,6 +156,7 @@ You can set these environment variables to configure the test suite:
TEST_OS The OS to run the tests in. Currently supported values:
"centos-9-stream"
"centos-10"
"debian-stable"
"debian-testing"
"fedora-39"

View File

@ -1296,7 +1296,7 @@ ProtocolHeader = X-Forwarded-Proto
b.logout()
b.cdp.invoke("Browser.close")
@testlib.skipImage("nginx not installed", "centos-8-stream", "rhel-*", "debian-*", "ubuntu-*", "arch")
@testlib.skipImage("nginx not installed", "centos-*", "rhel-*", "debian-*", "ubuntu-*", "arch")
@testlib.skipOstree("nginx not installed")
@testlib.skipBrowser("Firefox needs proper cert and CA", "firefox")
def testNginxTLS(self):
@ -1375,7 +1375,7 @@ server {
b.click('#login-button')
b.wait_visible('.pf-v5-c-card.system-health')
@testlib.skipImage("nginx not installed", "centos-8-stream", "rhel-*", "debian-*", "ubuntu-*", "arch")
@testlib.skipImage("nginx not installed", "centos-*", "rhel-*", "debian-*", "ubuntu-*", "arch")
@testlib.skipOstree("nginx not installed")
@testlib.skipBrowser("Firefox needs proper cert and CA", "firefox")
def testNginxNoTLS(self):

View File

@ -297,7 +297,7 @@ class TestBondingVirt(netlib.NetworkCase):
b.wait_not_present("#networking-interfaces tr[data-interface='tbond']")
b.wait_visible(f"#networking-interfaces tr[data-interface='{iface}']")
@testlib.skipImage("TODO: no dhclient on Arch image", "arch")
@testlib.skipImage("no dhclient on OS image", "arch", "centos-10*", "rhel-10*")
@testlib.skipImage("Main interface can't be managed", "debian-*", "ubuntu-*")
@testlib.skipOstree("not using dhclient")
def testSlowly(self):

View File

@ -66,7 +66,7 @@ class TestNetworkingCheckpoints(netlib.NetworkCase):
b.wait_not_present("#confirm-breaking-change-popup")
@testlib.skipImage("Main interface settings are read-only", "debian-*")
@testlib.skipImage("not using dhclient", "arch")
@testlib.skipImage("no dhclient on OS image", "arch", "centos-10*", "rhel-10*")
@testlib.skipOstree("not using dhclient")
def testCheckpointSlowRollback(self):
b = self.browser

View File

@ -129,7 +129,7 @@ class TestNetworkingSettings(netlib.NetworkCase):
# Check that IPv4/IPv6 settings dialogs only show the supported IP methods for wireguard
# Skip images without the wireguard-tools package
if m.image not in ["rhel4edge", "centos-8-stream"] and not m.image.startswith("rhel-8"):
if m.image not in ["rhel4edge", "centos-8-stream", "centos-10"] and not m.image.startswith("rhel-8"):
b.go("/network")
b.click("#networking-add-wg")
b.set_input_text("#network-wireguard-settings-addresses-input", "1.2.3.4/24")

View File

@ -25,6 +25,7 @@ import testlib
@testlib.skipOstree("NetworkManager-team not installed")
@testlib.skipImage("TODO: networkmanager fails on Arch Linux", "arch")
@testlib.skipImage("team not supported", "centos-10*", "rhel-10*")
@testlib.skipDistroPackage()
@testlib.nondestructive
class TestTeam(netlib.NetworkCase):

View File

@ -8,6 +8,7 @@ import packagelib
import testlib
@testlib.skipImage("wireguard not available", "centos-10*", "rhel-10*")
class TestWireGuard(packagelib.PackageCase, netlib.NetworkCase):
provision = {
"machine1": {"address": "192.168.100.11/24", "memory_mb": 768},

View File

@ -24,6 +24,7 @@ import testlib
SIZE_10G = "10000000000"
@testlib.skipImage("vdo not currently available in RHEL 10", "rhel-10*", "centos-10*")
class TestStorageVDO(storagelib.StorageCase):
provision = {"0": {"memory_mb": 1800}}
@ -389,6 +390,7 @@ config: !Configuration
@testlib.onlyImage("VDO API only supported on RHEL", "rhel-*", "centos-*")
@testlib.skipImage("vdo not currently available in RHEL 10", "rhel-10*", "centos-10*")
class TestStoragePackagesVDO(packagelib.PackageCase, storagelib.StorageHelpers):
provision = {"0": {"memory_mb": 1500}}