Merge pull request #254 from fabric-testbed/housekeeping

Housekeeping updates
fabric-testbed · Sep 25, 2023 · 8dd815b · 8dd815b
2 parents 39f6b46 + cb77914
commit 8dd815b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix an error in `Node.list_networks()` (Issue
   [#239](https://github.com/fabric-testbed/fabrictestbed-extensions/issues/239),
   PR [#241](https://github.com/fabric-testbed/fabrictestbed-extensions/pull/241))
+- Honor wait_timeout in slice.submit()
+  ([#253](https://github.com/fabric-testbed/fabrictestbed-extensions/pull/253))
 
 ### Added
 

diff --git a/tests/integration/test_bastion_ssh.py b/tests/integration/test_bastion_ssh.py
@@ -26,9 +26,7 @@ def test_probe_bastion_host_no_username(self):
         Test bastion with an empty username.
         """
         fm = FablibManager(offline=True, bastion_username="")
-        self.assertRaises(
-            paramiko.ssh_exception.AuthenticationException, fm.probe_bastion_host
-        )
+        self.assertRaises(paramiko.ssh_exception.SSHException, fm.probe_bastion_host)
 
     def test_probe_bastion_host_empty_key(self):
         """
@@ -37,9 +35,7 @@ def test_probe_bastion_host_empty_key(self):
         keyfile = tempfile.NamedTemporaryFile()
 
         fm = FablibManager(offline=True, bastion_key_filename=keyfile.name)
-        self.assertRaises(
-            paramiko.ssh_exception.AuthenticationException, fm.probe_bastion_host
-        )
+        self.assertRaises(paramiko.ssh_exception.SSHException, fm.probe_bastion_host)
 
     def test_probe_bastion_host_bad_key(self):
         """
@@ -51,6 +47,4 @@ def test_probe_bastion_host_bad_key(self):
         rsa_key.write_private_key_file(keyfile.name)
 
         fm = FablibManager(offline=True, bastion_key_filename=keyfile.name)
-        self.assertRaises(
-            paramiko.ssh_exception.AuthenticationException, fm.probe_bastion_host
-        )
+        self.assertRaises(paramiko.ssh_exception.SSHException, fm.probe_bastion_host)