mirror of
https://github.com/cockpit-project/cockpit.git
synced 2026-11-03 21:49:50 -09:00
test: skip teaming/btrfs tests on Fedora ELN
Commit fd35533544 was insufficient, it only fixed one
scenario where we have to exclude tests, while storage-{basic,extra} and
main are left unfixed as they still ran teaming/btrfs tests.
This commit is contained in:
parent
2e208fcf64
commit
f891d5308b
5 changed files with 7 additions and 13 deletions
|
|
@ -214,12 +214,6 @@ if [ "$PLAN" = "storage-extra" ]; then
|
|||
TestStorageMountingLUKS
|
||||
TestStorageLvm
|
||||
"
|
||||
if [ "$TEST_OS" = "fedora-eln" ]; then
|
||||
EXCLUDES="$EXCLUDES
|
||||
TestStorageAnaconda.testBtrfs
|
||||
TestStorageAnaconda.testDegradedBtrfs
|
||||
"
|
||||
fi
|
||||
|
||||
# These don't test more external APIs
|
||||
EXCLUDES="$EXCLUDES
|
||||
|
|
|
|||
|
|
@ -13,7 +13,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.skipImage("team not supported", "centos-10*", "rhel-10*", "fedora-eln")
|
||||
@testlib.nondestructive
|
||||
class TestTeam(netlib.NetworkCase):
|
||||
def testBasic(self):
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ class TestStorageAnaconda(storagelib.StorageCase):
|
|||
self.confirm()
|
||||
m.execute("! findmnt --fstab -n /sysroot/var")
|
||||
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*')
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*', 'fedora-eln')
|
||||
def testBtrfs(self):
|
||||
b = self.browser
|
||||
|
||||
|
|
@ -345,7 +345,7 @@ class TestStorageAnaconda(storagelib.StorageCase):
|
|||
}
|
||||
})
|
||||
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*')
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*', 'fedora-eln')
|
||||
def testDegradedBtrfs(self):
|
||||
b = self.browser
|
||||
m = self.machine
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import testlib
|
|||
|
||||
|
||||
@testlib.nondestructive
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*')
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*', 'fedora-eln')
|
||||
class TestStorageBtrfs(storagelib.StorageCase):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ class TestStorageMounting(storagelib.StorageCase):
|
|||
def testMounting(self):
|
||||
self._testMounting()
|
||||
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*')
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*', 'fedora-eln')
|
||||
def testMountingBtrfs(self):
|
||||
self._testMounting("btrfs", "btrfs subvolume")
|
||||
|
||||
|
|
@ -155,7 +155,7 @@ ExecStart=/usr/bin/sleep infinity
|
|||
self.assertEqual(self.configuration_field("/dev/sda", "fstab", "dir"), "")
|
||||
b.wait_in_text(self.card_desc(filesystem, "Mount point"), "The filesystem has no permanent mount point.")
|
||||
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*')
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*', 'fedora-eln')
|
||||
def testMountingHelpBtrfs(self):
|
||||
self._testMountingHelp("btrfs", "btrfs subvolume")
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ ExecStart=/usr/bin/sleep infinity
|
|||
def testFstabOptions(self):
|
||||
self._testFstabOptions()
|
||||
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*')
|
||||
@testlib.skipImage('no btrfs support', 'rhel-*', 'centos-*', 'fedora-eln')
|
||||
def testFsabOptionsBtrfs(self):
|
||||
self._testFstabOptions("btrfs", "btrfs subvolume")
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue