Merge "Fix unbalanced-tuple-unpacking pylint error in conn_testers"

This commit is contained in:
Jenkins 2016-08-29 20:55:00 +00:00 committed by Gerrit Code Review
commit d8f811df78
1 changed files with 6 additions and 2 deletions

View File

@ -394,9 +394,11 @@ class OVSConnectionTester(OVSBaseConnectionTester):
def _setUp(self):
super(OVSConnectionTester, self)._setUp()
self.bridge = self.useFixture(net_helpers.OVSBridgeFixture()).bridge
self._peer, self._vm = self.useFixture(
machines = self.useFixture(
machine_fixtures.PeerMachines(
self.bridge, self.ip_cidr)).machines
self._peer = machines[0]
self._vm = machines[1]
self._set_port_attrs(self._peer.port)
self._set_port_attrs(self._vm.port)
@ -516,9 +518,11 @@ class LinuxBridgeConnectionTester(ConnectionTester):
def _setUp(self):
super(LinuxBridgeConnectionTester, self)._setUp()
self.bridge = self.useFixture(net_helpers.LinuxBridgeFixture()).bridge
self._peer, self._vm = self.useFixture(
machines = self.useFixture(
machine_fixtures.PeerMachines(
self.bridge, self.ip_cidr)).machines
self._peer = machines[0]
self._vm = machines[1]
@property
def bridge_namespace(self):