test: Centralize storage test skips on fedora-coreos

In commit 08bb66531e I missed that magic in storagelib.py as it was
using an unusual way to check for an Atomic image.

Closes #13142
This commit is contained in:
Martin Pitt 2019-11-13 23:14:41 +01:00 committed by Martin Pitt
parent 501a06f7bd
commit 3769995e9f
20 changed files with 2 additions and 23 deletions

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testBasic(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testFormatTooSmall(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testHiddenLuks(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testIgnored(self):

View File

@ -24,7 +24,6 @@ from testlib import *
@skipImage("UDisks doesn't have support for iSCSI", "debian-stable",
"ubuntu-1804", "ubuntu-stable", "debian-testing")
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testISCSI(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testLuks(self):

View File

@ -23,7 +23,6 @@ from testlib import *
@skipImage("UDisks doesn't have support for LVM", "debian-stable")
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testLvm(self):

View File

@ -27,7 +27,6 @@ def info_field(name, image_name):
return '#detail-header label:contains("%s") + div' % name
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def wait_states(self, states):

View File

@ -34,7 +34,6 @@ ExecStart=/usr/lib/storaged/storaged
"""
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testMounting(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testDosParts(self):

View File

@ -23,7 +23,6 @@ from testlib import *
@skipImage("UDisks doesn't have support for multipath", "debian-stable", "debian-testing", "ubuntu-1804", "ubuntu-stable")
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testBasic(self):

View File

@ -23,7 +23,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testNfsClient(self):
@ -224,7 +223,6 @@ class TestStorage(StorageCase):
b.wait_present("#detail-header button:contains(Mount)")
@skipImage("Image uses OSTree", "fedora-coreos")
class TestStoragePackages(StorageCase, PackageCase):
def testNfsMissingPackages(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testPartitions(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testRaidLevelOne(self):

View File

@ -25,7 +25,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def checkResize(self, fsys, crypto, can_shrink, can_grow, shrink_needs_unmount=None, grow_needs_unmount=None,

View File

@ -21,7 +21,6 @@ import parent
from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testScaling(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testUnused(self):

View File

@ -22,7 +22,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testUsed(self):

View File

@ -23,7 +23,6 @@ from storagelib import *
from testlib import *
@skipImage("udisks not installed, no cockpit-storage", "fedora-coreos")
class TestStorage(StorageCase):
def testVdo(self):

View File

@ -15,7 +15,6 @@
# You should have received a copy of the GNU Lesser General Public License
# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
import os
import re
from testlib import *
@ -25,8 +24,8 @@ class StorageCase(MachineCase):
def setUp(self):
if "atomic" in os.getenv("TEST_OS", ""):
self.skipTest("No storage on Atomic")
if self.image in ["fedora-coreos"]:
self.skipTest("No udisks/cockpit-storaged on OSTree images")
super(StorageCase, self).setUp()
self.storagectl_cmd = "udisksctl"