Merge pull request #579 from KKoukiou/stop-importing-storage-helpers

Stop importing storage helpers

test/check-storage-basic

@@ -20,7 +20,6 @@ import os
 from anacondalib import VirtInstallMachineCase, pixel_tests_ignore
 from installer import Installer
 from storage import Storage
-from storagelib import StorageHelpers  # pylint: disable=import-error
 from testlib import nondestructive, test_main  # pylint: disable=import-error
 
 TEST_DIR = os.path.dirname(__file__)
@@ -29,7 +28,7 @@ BOTS_DIR = f'{ROOT_DIR}/bots'
 
 
 @nondestructive
-class TestStorage(VirtInstallMachineCase, StorageHelpers):
+class TestStorage(VirtInstallMachineCase):
 
     def testLocalStandardDisks(self):
         b = self.browser
@@ -53,8 +52,8 @@ class TestStorage(VirtInstallMachineCase, StorageHelpers):
         # However, since the storage module initialization is long completed
         # the newly added disk, will not be visible in the UI,
         # until the test clicks on the re-scan button
-        dev = self.add_ram_disk(2)
-        dev = dev.split("/")[-1]
+        self.add_disk(2)
+        dev = "vdb"
         s.rescan_disks(["vda", dev])
 
         # Check that the disk selection persists when moving next and back
@@ -185,7 +184,7 @@ class TestStorage(VirtInstallMachineCase, StorageHelpers):
         b.wait_in_text("#critical-error-bz-report-modal header", "The installer cannot continue due to a critical error: Storage plugin failed")
 
 @nondestructive
-class TestMultipleDisks(VirtInstallMachineCase, StorageHelpers):
+class TestMultipleDisks(VirtInstallMachineCase):
 
     def testDiskSelectionLVM(self):
         """

test/check-storage-encryption

@@ -19,12 +19,11 @@ from anacondalib import VirtInstallMachineCase, pixel_tests_ignore
 from installer import Installer
 from password import Password
 from storage import Storage
-from storagelib import StorageHelpers  # pylint: disable=import-error
 from testlib import nondestructive, test_main  # pylint: disable=import-error
 
 
 @nondestructive
-class TestStorageEncryption(VirtInstallMachineCase, StorageHelpers):
+class TestStorageEncryption(VirtInstallMachineCase):
 
     def set_valid_password(self, password_ui, password="abcdefgh"):
         password_ui.set_password(password)

test/check-storage-erase-all-e2e

@@ -23,7 +23,6 @@ from password import Password
 from progress import Progress
 from review import Review
 from storage import Storage
-from storagelib import StorageHelpers  # pylint: disable=import-error
 from testlib import test_main  # pylint: disable=import-error
 from utils import get_pretty_name
 
@@ -32,7 +31,7 @@ ROOT_DIR = os.path.dirname(TEST_DIR)
 BOTS_DIR = f'{ROOT_DIR}/bots'
 
 
-class TestStorageEraseAll_E2E(VirtInstallMachineCase, StorageHelpers):
+class TestStorageEraseAll_E2E(VirtInstallMachineCase):
     """
     Test Fedora plans: https://fedoraproject.org/wiki/Test_Results:Current_Installation_Test
 

test/check-storage-home-reuse

@@ -21,7 +21,6 @@ from anacondalib import VirtInstallMachineCase, run_boot
 from installer import Installer
 from review import Review
 from storage import Storage
-from storagelib import StorageCase  # pylint: disable=import-error
 from testlib import nondestructive, skipImage, test_main  # pylint: disable=import-error
 from utils import pretend_default_scheme
 
@@ -31,7 +30,7 @@ BOTS_DIR = f'{ROOT_DIR}/bots'
 
 
 @nondestructive
-class TestStorageHomeReuseFedora(VirtInstallMachineCase, StorageCase):
+class TestStorageHomeReuseFedora(VirtInstallMachineCase):
     disk_image = "fedora-rawhide"
 
     def setUp(self):

test/check-storage-home-reuse-e2e

@@ -21,7 +21,6 @@ from anacondalib import VirtInstallMachineCase, test_plan
 from installer import Installer
 from progress import Progress
 from storage import Storage
-from storagelib import StorageCase  # pylint: disable=import-error
 from testlib import test_main  # pylint: disable=import-error
 from utils import pretend_default_scheme
 
@@ -30,7 +29,7 @@ ROOT_DIR = os.path.dirname(TEST_DIR)
 BOTS_DIR = f'{ROOT_DIR}/bots'
 
 
-class TestStorageHomeReuse_E2E(VirtInstallMachineCase, StorageCase):
+class TestStorageHomeReuse_E2E(VirtInstallMachineCase):
     disk_image = "fedora-rawhide"
 
     def setUp(self):

test/check-storage-mountpoints-btrfs

@@ -19,12 +19,11 @@ from anacondalib import VirtInstallMachineCase
 from installer import Installer
 from review import Review
 from storage import Storage
-from storagelib import StorageCase  # pylint: disable=import-error
 from testlib import nondestructive, skipImage, test_main  # pylint: disable=import-error
 
 
 @nondestructive
-class TestStorageMountPointsBtrfs (VirtInstallMachineCase, StorageCase):
+class TestStorageMountPointsBtrfs (VirtInstallMachineCase):
     @skipImage("btrfs support missing on fedora-eln image", "fedora-eln-boot")
     def testBtrfsSubvolumes(self):
         b = self.browser

test/check-storage-mountpoints-lvm

@@ -19,12 +19,11 @@ from anacondalib import VirtInstallMachineCase
 from installer import Installer
 from review import Review
 from storage import Storage
-from storagelib import StorageCase  # pylint: disable=import-error
 from testlib import nondestructive, test_main  # pylint: disable=import-error
 
 
 @nondestructive
-class TestStorageMountPointsLVM(VirtInstallMachineCase, StorageCase):
+class TestStorageMountPointsLVM(VirtInstallMachineCase):
 
     def testLVM(self):
         b = self.browser

test/check-storage-mountpoints-raid

@@ -19,12 +19,11 @@ from anacondalib import VirtInstallMachineCase
 from installer import Installer
 from review import Review
 from storage import Storage
-from storagelib import StorageCase  # pylint: disable=import-error
 from testlib import nondestructive, test_main  # pylint: disable=import-error
 
 
 @nondestructive
-class TestStorageMountPointsRAID(VirtInstallMachineCase, StorageCase):
+class TestStorageMountPointsRAID(VirtInstallMachineCase):
 
     def testEncryptedUnlockRAIDonLUKS(self):
         # RAID on LUKS: partition -> LUKS -> RAID -> filesystem

test/check-storage-mountpoints-raid-e2e

@@ -18,11 +18,10 @@
 from anacondalib import VirtInstallMachineCase, test_plan
 from installer import Installer
 from storage import Storage
-from storagelib import StorageCase  # pylint: disable=import-error
 from testlib import test_main  # pylint: disable=import-error
 
 
-class TestStorageMountPointsRAID_E2E(VirtInstallMachineCase, StorageCase):
+class TestStorageMountPointsRAID_E2E(VirtInstallMachineCase):
     @test_plan("https://fedoraproject.org/wiki/QA:Testcase_webui_partitioning_mount_point_assignment_raid")
     def testLVMOnRAID(self):
         """

test/check-storage-reclaim

@@ -20,15 +20,14 @@ from installer import Installer
 from operating_systems import WindowsOS
 from review import Review
 from storage import Storage
-from storagelib import StorageCase
 from testlib import (
     nondestructive,
     test_main,
 )
 
 
 @nondestructive
-class TestStorageReclaimSpace(VirtInstallMachineCase, StorageCase):
+class TestStorageReclaimSpace(VirtInstallMachineCase):
     def setup_partitions(self, s, i):
         disk = "/dev/vda"
         btrfsname = "btrfstest"
@@ -278,7 +277,7 @@ class TestStorageReclaimSpace(VirtInstallMachineCase, StorageCase):
 
 
 @nondestructive
-class TestStorageReclaimSpaceLUKS(VirtInstallMachineCase, StorageCase):
+class TestStorageReclaimSpaceLUKS(VirtInstallMachineCase):
 
     def testReclaimExt4onLUKS(self):
         # Shrinking LUKS partitions is not yet supported
@@ -319,7 +318,7 @@ class TestStorageReclaimSpaceLUKS(VirtInstallMachineCase, StorageCase):
 
 
 @nondestructive
-class TestStorageReclaimExistingSystemFedora(VirtInstallMachineCase, StorageCase):
+class TestStorageReclaimExistingSystemFedora(VirtInstallMachineCase):
     disk_image = "fedora-rawhide"
 
     def testDeletePartition(self):