Skip to content

Commit 6f07c1c

Browse files
committed
pam/integration-tests/ssh: Use a virtual terminal on SSH
1 parent 6843826 commit 6f07c1c

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

pam/integration-tests/ssh_test.go

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -484,12 +484,7 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
484484
t.Logf("SSH client\n ##### LOG #####\n %s \n ##### END #####", sshLog)
485485
})
486486

487-
td := newTapeData(tc.tape, append(defaultTapeSettings, tc.tapeSettings...)...)
488-
td.Command = tapeCommand
489-
td.Env[pam_test.RunnerEnvSupportsConversation] = "1"
490-
td.Env["HOME"] = t.TempDir()
491-
td.Env[pamSSHUserEnv] = user
492-
td.Env["AUTHD_PAM_SSH_ARGS"] = strings.Join([]string{
487+
sshCmd := []string{
493488
"-p", sshdPort,
494489
"-F", os.DevNull,
495490
"-i", os.DevNull,
@@ -498,9 +493,21 @@ Wait@%dms`, sshDefaultFinalWaitTimeout),
498493
"-o", "PubkeyAuthentication=no",
499494
"-o", "UserKnownHostsFile=" + knownHost,
500495
"-o", "ConnectTimeout=300",
496+
"-t",
501497
"-E", sshLogFile,
502498
"-vvv",
503-
}, " ")
499+
}
500+
501+
// if !tc.interactiveShell {
502+
// sshCmd = append(sshCmd, "true")
503+
// }
504+
505+
td := newTapeData(tc.tape, append(defaultTapeSettings, tc.tapeSettings...)...)
506+
td.Command = tapeCommand
507+
td.Env[pam_test.RunnerEnvSupportsConversation] = "1"
508+
td.Env["HOME"] = t.TempDir()
509+
td.Env[pamSSHUserEnv] = user
510+
td.Env["AUTHD_PAM_SSH_ARGS"] = strings.Join(sshCmd, " ")
504511
td.Variables = tc.tapeVariables
505512
td.RunVhs(t, vhsTestTypeSSH, outDir, nil)
506513
got := sanitizeGoldenFile(t, td, outDir)

0 commit comments

Comments
 (0)