From 00e9299f3b03949eb1f5c00b68114278c6c4c62a Mon Sep 17 00:00:00 2001
From: Tim Ross <tim.ross@goteleport.com>
Date: Thu, 2 Sep 2021 10:30:15 -0400
Subject: [PATCH] final cleanup of integration tests

---
 integration/integration_test.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/integration/integration_test.go b/integration/integration_test.go
index b0c2277be4144..8531a4676886c 100644
--- a/integration/integration_test.go
+++ b/integration/integration_test.go
@@ -4185,10 +4185,7 @@ func testWindowChange(t *testing.T, suite *integrationTestSuite) {
 		cl.Stdin = personA
 
 		err = cl.SSH(context.TODO(), []string{}, false)
-		switch trace.Unwrap(err).(type) {
-		case nil, *ssh.ExitError, *ssh.ExitMissingError:
-			break
-		default:
+		if !isSSHError(err) {
 			require.NoError(t, err)
 		}
 	}
@@ -4225,11 +4222,12 @@ func testWindowChange(t *testing.T, suite *integrationTestSuite) {
 		for i := 0; i < 10; i++ {
 			err = cl.Join(context.TODO(), apidefaults.Namespace, session.ID(sessionID), personB)
 			if err == nil || isSSHError(err) {
+				err = nil
 				break
 			}
-
-			require.NoError(t, err)
 		}
+
+		require.NoError(t, err)
 	}
 
 	// waitForOutput checks that the output of the passed in terminal contains