From 1f12b873907523555ec75aed3b4479dde8871c88 Mon Sep 17 00:00:00 2001
From: Adam Lock <locka99@gmail.com>
Date: Tue, 8 Mar 2022 23:07:05 +0000
Subject: [PATCH] Fix failing integration test

---
 integration/src/harness.rs | 29 +++++++++++++++++++++--------
 integration/src/tests.rs   |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/integration/src/harness.rs b/integration/src/harness.rs
index 32223b62c..763e62485 100644
--- a/integration/src/harness.rs
+++ b/integration/src/harness.rs
@@ -502,7 +502,7 @@ pub fn regular_client_test<T>(
     session.disconnect();
 }
 
-pub fn inactive_session_client_test<T>(
+pub fn invalid_session_client_test<T>(
     client_endpoint: T,
     identity_token: IdentityToken,
     _rx_client_command: mpsc::Receiver<ClientCommand>,
@@ -531,6 +531,24 @@ pub fn inactive_session_client_test<T>(
     session.disconnect();
 }
 
+pub fn invalid_token_test<T>(
+    client_endpoint: T,
+    identity_token: IdentityToken,
+    _rx_client_command: mpsc::Receiver<ClientCommand>,
+    mut client: Client,
+) where
+    T: Into<EndpointDescription>,
+{
+    // Connect to the server
+    let client_endpoint = client_endpoint.into();
+    info!(
+        "Client will try to connect to endpoint {:?}",
+        client_endpoint
+    );
+    let session = client.connect_to_endpoint(client_endpoint, identity_token);
+    assert!(session.is_err());
+}
+
 pub fn regular_server_test(rx_server_command: mpsc::Receiver<ServerCommand>, server: Server) {
     trace!("Hello from server");
     // Wrap the server - a little juggling is required to give one rc
@@ -590,7 +608,7 @@ pub fn connect_with_get_endpoints(port: u16) {
     );
 }
 
-pub fn connect_with_invalid_active_session(
+pub fn connect_with_invalid_token(
     port: u16,
     mut client_endpoint: EndpointDescription,
     identity_token: IdentityToken,
@@ -600,12 +618,7 @@ pub fn connect_with_invalid_active_session(
     connect_with_client_test(
         port,
         move |rx_client_command: mpsc::Receiver<ClientCommand>, client: Client| {
-            inactive_session_client_test(
-                client_endpoint,
-                identity_token,
-                rx_client_command,
-                client,
-            );
+            invalid_token_test(client_endpoint, identity_token, rx_client_command, client);
         },
     );
 }
diff --git a/integration/src/tests.rs b/integration/src/tests.rs
index fc625f985..4a5955edb 100644
--- a/integration/src/tests.rs
+++ b/integration/src/tests.rs
@@ -365,7 +365,7 @@ fn connect_basic128rsa15_with_username_password() {
 #[test]
 #[ignore]
 fn connect_basic128rsa15_with_invalid_username_password() {
-    connect_with_invalid_active_session(
+    connect_with_invalid_token(
         next_port(),
         endpoint_basic128rsa15_sign_encrypt(),
         client_invalid_user_token(),