diff options
| -rw-r--r-- | tests/storage.py | 4 | ||||
| -rw-r--r-- | tests/xmlparse.py | 8 | ||||
| -rw-r--r-- | virtinst/support.py | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/tests/storage.py b/tests/storage.py index a0b2d50e..78200a4f 100644 --- a/tests/storage.py +++ b/tests/storage.py @@ -182,10 +182,6 @@ class TestStorage(unittest.TestCase): removePool(poolobj) def testGlusterPool(self): - if not self.conn.check_support(self.conn.SUPPORT_CONN_POOL_GLUSTERFS): - raise unittest.SkipTest("Gluster pools not supported with this " - "libvirt version.") - poolobj = createPool(self.conn, StoragePool.TYPE_GLUSTER, "pool-gluster") removePool(poolobj) diff --git a/tests/xmlparse.py b/tests/xmlparse.py index ccf07542..b0f5dcf0 100644 --- a/tests/xmlparse.py +++ b/tests/xmlparse.py @@ -220,9 +220,7 @@ class XMLParseTest(unittest.TestCase): check("nosharepages", False, True) check("locked", False, True) - self._alter_compare(guest.get_xml(), outfile, - support_check=[self.conn.SUPPORT_CONN_VMPORT, - self.conn.SUPPORT_CONN_VMCOREINFO]) + self._alter_compare(guest.get_xml(), outfile) def testSeclabel(self): guest, outfile = self._get_test_content("change-seclabel") @@ -1220,10 +1218,6 @@ class XMLParseTest(unittest.TestCase): utils.test_create(self.conn, pool.get_xml(), "storagePoolDefineXML") def testGlusterPool(self): - if not self.conn.check_support(self.conn.SUPPORT_CONN_POOL_GLUSTERFS): - raise unittest.SkipTest("Gluster pools not supported with this " - "libvirt version.") - basename = "pool-gluster" infile = "tests/storage-xml/%s.xml" % basename outfile = "tests/xmlparse-xml/%s-out.xml" % basename diff --git a/virtinst/support.py b/virtinst/support.py index dc9fe006..c548a59c 100644 --- a/virtinst/support.py +++ b/virtinst/support.py @@ -266,7 +266,6 @@ SUPPORT_CONN_USBREDIR = _make( version="0.9.5", hv_version={"qemu": "1.3.0", "test": 0}) SUPPORT_CONN_DEVICE_BOOTORDER = _make( version="0.8.8", hv_version={"qemu": 0, "test": 0}) -SUPPORT_CONN_POOL_GLUSTERFS = _make(version="1.2.0") SUPPORT_CONN_CPU_MODEL_NAMES = _make(function="virConnect.getCPUModelNames", run_args=("x86_64", 0)) SUPPORT_CONN_HYPERV_VAPIC = _make( @@ -275,7 +274,6 @@ SUPPORT_CONN_HYPERV_CLOCK = _make( version="1.2.2", hv_version={"qemu": "2.0.0", "test": 0}) SUPPORT_CONN_HYPERV_CLOCK_RHEL = _make( version="1.2.2", hv_version={"qemu": "1.5.3", "test": 0}) -SUPPORT_CONN_LOADER_ROM = _make(version="1.2.9") SUPPORT_CONN_DOMAIN_CAPABILITIES = _make( function="virConnect.getDomainCapabilities", run_args=(None, None, None, None)) |