[master 8/8] edd: Remove a bunch of nonfunctional EDD tests.

vathpela installerbot-noreply at redhat.com
Fri Oct 9 19:32:08 UTC 2015


From: Peter Jones <pjones at redhat.com>

Signed-off-by: Peter Jones <pjones at redhat.com>
---
 tests/devicelibs_test/edd_test.py | 170 --------------------------------------
 1 file changed, 170 deletions(-)

diff --git a/tests/devicelibs_test/edd_test.py b/tests/devicelibs_test/edd_test.py
index dcad674..edf17d3 100644
--- a/tests/devicelibs_test/edd_test.py
+++ b/tests/devicelibs_test/edd_test.py
@@ -260,173 +260,3 @@ def test_get_edd_dict_absurd_virt(self):
             self.assertIn(mock.call(*info), edd.log.info.call_args_list)
         self.assertEqual(edd.log.warning.called, False)
         self.assertEqual(edd.log.error.called, False)
-
-    @unittest.skip("not implemented")
-    def test_collect_edd_data_cciss(self):
-        EddTestFS(self, edd).sda_cciss()
-        edd_dict = edd.collect_edd_data()
-
-        self.assertEqual(edd_dict[0x80].pci_dev, None)
-        self.assertEqual(edd_dict[0x80].channel, None)
-
-    @unittest.skip("not implemented")
-    def test_edd_entry_str(self):
-        EddTestFS(self, edd).sda_vda()
-        edd_dict = edd.collect_edd_data()
-        expected_output = """\ttype: ATA, ata_device: 0
-\tchannel: 0, mbr_signature: 0x000ccb01
-\tpci_dev: 00:01.1, scsi_id: None
-\tscsi_lun: None, sectors: 2097152"""
-        self.assertEqual(str(edd_dict[0x80]), expected_output)
-
-    @unittest.skip("not implemented")
-    def test_matcher_device_path(self):
-        EddTestFS(self, edd).sda_vda()
-        edd_dict = edd.collect_edd_data()
-
-        analyzer = edd.EddMatcher(edd_dict[0x80])
-        path = analyzer.devname_from_pci_dev()
-        self.assertEqual(path, "sda")
-
-        analyzer = edd.EddMatcher(edd_dict[0x81])
-        path = analyzer.devname_from_pci_dev()
-        self.assertEqual(path, "vda")
-
-    @unittest.skip("not implemented")
-    def test_bad_device_path(self):
-        EddTestFS(self, edd).sda_vda_no_pcidev()
-        edd_dict = edd.collect_edd_data()
-
-        analyzer = edd.EddMatcher(edd_dict[0x80])
-        path = analyzer.devname_from_pci_dev()
-        self.assertEqual(path, None)
-
-    @unittest.skip("not implemented")
-    def test_bad_host_bus(self):
-        EddTestFS(self, edd).sda_vda_no_host_bus()
-
-        edd_dict = edd.collect_edd_data()
-
-        # 0x80 entry is basted so fail without an exception
-        analyzer = edd.EddMatcher(edd_dict[0x80])
-        devname = analyzer.devname_from_pci_dev()
-        self.assertEqual(devname, None)
-
-        # but still succeed on 0x81
-        analyzer = edd.EddMatcher(edd_dict[0x81])
-        devname = analyzer.devname_from_pci_dev()
-        self.assertEqual(devname, "vda")
-
-    @unittest.skip("not implemented")
-    def test_get_edd_dict_1(self):
-        """ Test get_edd_dict()'s pci_dev matching. """
-        EddTestFS(self, edd).sda_vda()
-        self.assertEqual(edd.get_edd_dict([]),
-                         {'sda' : 0x80,
-                          'vda' : 0x81})
-
-    @unittest.skip("not implemented")
-    def test_get_edd_dict_2(self):
-        """ Test get_edd_dict()'s pci_dev matching. """
-        edd.collect_mbrs = mock.Mock(return_value = {
-                'sda' : '0x000ccb01',
-                'vda' : '0x0006aef1'})
-        EddTestFS(self, edd).sda_vda_missing_details()
-        self.assertEqual(edd.get_edd_dict([]),
-                         {'sda' : 0x80,
-                          'vda' : 0x81})
-
-    @unittest.skip("not implemented")
-    def test_get_edd_dict_3(self):
-        """ Test scenario when the 0x80 and 0x81 edd directories contain the
-            same data and give no way to distinguish among the two devices.
-        """
-        edd.collect_mbrs = mock.Mock(return_value={'sda' : '0x000ccb01',
-                                                   'vda' : '0x0006aef1'})
-        EddTestFS(self, edd).sda_sdb_same()
-        self.assertEqual(edd.get_edd_dict([]), {})
-        self.assertIn((('edd: both edd entries 0x80 and 0x81 seem to map to sda',), {}),
-                      edd.log.info.call_args_list)
-
-class EddTestFS(object):
-    def __init__(self, test_case, target_module):
-        self.fs = mock.DiskIO() # pylint: disable=no-member
-        test_case.take_over_io(self.fs, target_module)
-
-    def sda_vda_missing_details(self):
-        self.fs["/sys/firmware/edd/int13_dev80"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev80/mbr_signature"] = "0x000ccb01\n"
-        self.fs["/sys/firmware/edd/int13_dev81"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev81/mbr_signature"] = "0x0006aef1\n"
-
-    def sda_vda(self):
-        self.fs["/sys/firmware/edd/int13_dev80"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev80/host_bus"] = "PCI 	00:01.1  channel: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev80/interface"] = "ATA     	device: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev80/mbr_signature"] = "0x000ccb01\n"
-        self.fs["/sys/firmware/edd/int13_dev80/sectors"] = "2097152\n"
-
-        self.fs["/sys/firmware/edd/int13_dev81"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev81/host_bus"] = "PCI 	00:05.0  channel: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev81/interface"] = "SCSI    	id: 0  lun: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev81/mbr_signature"] = "0x0006aef1\n"
-        self.fs["/sys/firmware/edd/int13_dev81/sectors"] = "16777216\n"
-
-        self.fs["/sys/devices/pci0000:00/0000:00:01.1/host0/target0:0:0/0:0:0:0/block"] = self.fs.Dir()
-        self.fs["/sys/devices/pci0000:00/0000:00:01.1/host0/target0:0:0/0:0:0:0/block/sda"] = self.fs.Dir()
-
-        self.fs["/sys/devices/pci0000:00/0000:00:05.0/virtio2/block"] = self.fs.Dir()
-        self.fs["/sys/devices/pci0000:00/0000:00:05.0/virtio2/block/vda"] = self.fs.Dir()
-
-        return self.fs
-
-    def sda_vda_no_pcidev(self):
-        self.sda_vda()
-        entries = [e for e in self.fs.fs if e.startswith("/sys/devices/pci")]
-        for e in entries:
-            self.fs.os_remove(e)
-        return self.fs
-
-    def sda_vda_no_host_bus(self):
-        self.sda_vda()
-        self.fs["/sys/firmware/edd/int13_dev80/host_bus"] = "PCI 	00:01.1  channel: \n"
-        self.fs.os_remove("/sys/firmware/edd/int13_dev80/mbr_signature")
-        self.fs.os_remove("/sys/firmware/edd/int13_dev81/mbr_signature")
-
-    def sda_cciss(self):
-        self.fs["/sys/firmware/edd/int13_dev80"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev80/host_bus"] = "PCIX	05:00.0  channel: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev80/interface"] = "RAID    	identity_tag: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev80/mbr_signature"] = "0x000ccb01\n"
-        self.fs["/sys/firmware/edd/int13_dev80/sectors"] = "2097152\n"
-
-        return self.fs
-
-    def vda_vdb(self):
-        self.fs["/sys/firmware/edd/int13_dev80"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev80/host_bus"] = "PCI 	00:05.0  channel: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev80/interface"] = "SCSI    	id: 0  lun: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev80/sectors"] = "16777216\n"
-
-        self.fs["/sys/firmware/edd/int13_dev81"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev81/host_bus"] = "PCI 	00:06.0  channel: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev81/interface"] = "SCSI    	id: 0  lun: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev81/sectors"] = "4194304\n"
-
-        return self.fs
-
-    def sda_sdb_same(self):
-        self.fs["/sys/firmware/edd/int13_dev80"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev80/host_bus"] = "PCI 	00:01.1  channel: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev80/interface"] = "ATA     	device: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev80/mbr_signature"] = "0x000ccb01"
-        self.fs["/sys/firmware/edd/int13_dev80/sectors"] = "2097152\n"
-
-        self.fs["/sys/firmware/edd/int13_dev81"] = self.fs.Dir()
-        self.fs["/sys/firmware/edd/int13_dev81/host_bus"] = "PCI 	00:01.1  channel: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev81/interface"] = "ATA     	device: 0\n"
-        self.fs["/sys/firmware/edd/int13_dev81/mbr_signature"] = "0x0006aef1"
-        self.fs["/sys/firmware/edd/int13_dev81/sectors"] = "2097152\n"
-
-        self.fs["/sys/devices/pci0000:00/0000:00:01.1/host0/target0:0:0/0:0:0:0/block"] = self.fs.Dir()
-        self.fs["/sys/devices/pci0000:00/0000:00:01.1/host0/target0:0:0/0:0:0:0/block/sda"] = self.fs.Dir()


-- 
To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/1ca8e4525277787ba5c9b9658a774d6da2cb7994


More information about the anaconda-patches mailing list