final cleanup of integration tests

gravitational · Sep 7, 2021 · d4bbb01 · d4bbb01
1 parent 9dc9763
commit d4bbb01
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -4176,10 +4176,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)
 		}
 	}
@@ -4216,11 +4213,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