x/tobiko
Code Issues Proposed changes

Update requirements: sshtunnel>=0.2.2

Browse Source 
Change-Id: I90b9e2126d94bb9c3e19a0e7613bcf6bbf188f63
This commit is contained in:
Federico Ressi 2020-11-02 15:18:00 +01:00
parent d412d78f79
commit 0146c96046
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -19,6 +19,6 @@ python-novaclient>=9.1.0 # Apache-2.0
python-octaviaclient>=1.9.0 # Apache-2.0 python-octaviaclient>=1.9.0 # Apache-2.0
python-openstackclient>=3.12.0 # Apache-2.0 python-openstackclient>=3.12.0 # Apache-2.0
six>=1.11.0 # MIT six>=1.11.0 # MIT
sshtunnel>=0.1.5.0 # MIT sshtunnel>=0.2.2 # MIT
stestr>=2.0.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT

4
tobiko/shell/ssh/_forward.py
View File

@ -228,11 +228,11 @@ class SSHTunnelForwarder(sshtunnel.SSHTunnelForwarder):
def _get_transport(self): def _get_transport(self):
return self.ssh_client.connect().get_transport() return self.ssh_client.connect().get_transport()
def _stop_transport(self): def _stop_transport(self, force=True):
if self.is_active: if self.is_active:
del self._transport del self._transport
assert not self.is_active assert not self.is_active
super(SSHTunnelForwarder, self)._stop_transport() super(SSHTunnelForwarder, self)._stop_transport(force=force)
@staticmethod @staticmethod
def _get_binds(bind_address, bind_addresses, is_remote=False): def _get_binds(bind_address, bind_addresses, is_remote=False):