devices: interface: Test remaining code coverage

This commit is contained in:
Cole Robinson 2019-06-10 16:08:45 -04:00
parent f056798918
commit b0b3ba4e1c
2 changed files with 8 additions and 8 deletions

View File

@ -213,16 +213,20 @@ class TestXMLMisc(unittest.TestCase):
self.assertTrue(not bool(fixlist))
def test_nonpredicatble_generate(self):
realconn = virtinst.cli.getConnection("test:///default")
kvm_uri = utils.URIs.kvm.replace(",predictable", "")
kvmconn = virtinst.cli.getConnection(kvm_uri)
testconn = virtinst.cli.getConnection("test:///default")
testuuid = virtinst.Guest.generate_uuid(self.conn)
randomuuid = virtinst.Guest.generate_uuid(realconn)
randomuuid = virtinst.Guest.generate_uuid(testconn)
self.assertTrue(randomuuid != testuuid)
self.assertTrue(len(randomuuid) == len(testuuid))
testmac = virtinst.DeviceInterface.generate_mac(self.conn)
randommac = virtinst.DeviceInterface.generate_mac(realconn)
randommac = virtinst.DeviceInterface.generate_mac(testconn)
qemumac = virtinst.DeviceInterface.generate_mac(kvmconn)
self.assertTrue(randommac != testmac)
self.assertTrue(qemumac != testmac)
self.assertTrue(len(randommac) == len(testmac))
def test_support_misc(self):

View File

@ -169,9 +169,7 @@ class DeviceInterface(Device):
return self.bridge
if self.type == self.TYPE_DIRECT:
return self.source_dev
if self.type == self.TYPE_USER or self.type == self.TYPE_ETHERNET:
return None
return self.network or self.bridge or self.source_dev
return None
def _set_source(self, newsource):
"""
Convenience function, try to set the relevant <source> value
@ -275,7 +273,5 @@ class DeviceInterface(Device):
srctype, br = _default_source(self.conn)
if srctype == self.TYPE_BRIDGE:
self.bridge = br
if self.type == self.TYPE_DIRECT and not self.source_mode:
self.source_mode = "vepa"
if not self.model:
self.model = self.default_model(guest)