From 0146c960461051492a3dbfe01b116dd348a55832 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Mon, 2 Nov 2020 15:18:00 +0100
Subject: [PATCH] Update requirements: sshtunnel>=0.2.2
Change-Id: I90b9e2126d94bb9c3e19a0e7613bcf6bbf188f63
---
requirements.txt | 2 +-
tobiko/shell/ssh/_forward.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 672b74c33..7b4a85249 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,6 +19,6 @@ python-novaclient>=9.1.0 # Apache-2.0
python-octaviaclient>=1.9.0 # Apache-2.0
python-openstackclient>=3.12.0 # Apache-2.0
six>=1.11.0 # MIT
-sshtunnel>=0.1.5.0 # MIT
+sshtunnel>=0.2.2 # MIT
stestr>=2.0.0 # Apache-2.0
testtools>=2.2.0 # MIT
diff --git a/tobiko/shell/ssh/_forward.py b/tobiko/shell/ssh/_forward.py
index 6feebf00d..b0e978ac7 100644
--- a/tobiko/shell/ssh/_forward.py
+++ b/tobiko/shell/ssh/_forward.py
@@ -228,11 +228,11 @@ class SSHTunnelForwarder(sshtunnel.SSHTunnelForwarder):
def _get_transport(self):
return self.ssh_client.connect().get_transport()
- def _stop_transport(self):
+ def _stop_transport(self, force=True):
if self.is_active:
del self._transport
assert not self.is_active
- super(SSHTunnelForwarder, self)._stop_transport()
+ super(SSHTunnelForwarder, self)._stop_transport(force=force)
@staticmethod
def _get_binds(bind_address, bind_addresses, is_remote=False):