cleanup(pam/integration-tests): Do not hardcode the socket paths (#232)

The authd socket paths are hardcoded to a temporary location. While this is not a problem per se it also may potentially break the ability of running tests in parallel or in setups where /tmp is not the the $TMPDIR or $GOTMPDIR. So, make this just more dynamic by runnig the tape files with an env variable (we're in a terminal after all!), and run vhs with such variable set to the temporary socket path that authd provides us
ubuntu · Feb 27, 2024 · ece51bb · ece51bb
2 parents ff21a9c + 1017478
commit ece51bb
Show file tree

Hide file tree

Showing 48 changed files with 260 additions and 260 deletions.
diff --git a/pam/integration-tests/integration_test.go b/pam/integration-tests/integration_test.go
@@ -28,10 +28,9 @@ func TestCLIAuthenticate(t *testing.T) {
 	gpasswdOutput := filepath.Join(outDir, "gpasswd", "authenticate.output")
 	groupsFile := filepath.Join(testutils.TestFamilyPath(t), "gpasswd.group")
 
-	socketPath := "/tmp/pam-cli-authenticate-tests.sock"
+	const socketPathEnv = "AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK"
 	ctx, cancel := context.WithCancel(context.Background())
-	_, stopped := testutils.RunDaemon(ctx, t, daemonPath,
-		testutils.WithSocketPath(socketPath),
+	socketPath, stopped := testutils.RunDaemon(ctx, t, daemonPath,
 		testutils.WithEnvironment(grouptests.GPasswdMockEnv(t, gpasswdOutput, groupsFile)...),
 	)
 	t.Cleanup(func() {
@@ -77,6 +76,7 @@ func TestCLIAuthenticate(t *testing.T) {
 			cmd := exec.Command("vhs", filepath.Join(currentDir, "testdata", "tapes", tc.tape+".tape"))
 			cmd.Env = testutils.AppendCovEnv(cmd.Env)
 			cmd.Env = append(cmd.Env, pathEnv)
+			cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", socketPathEnv, socketPath))
 			cmd.Dir = outDir
 
 			out, err := cmd.CombinedOutput()
@@ -89,7 +89,7 @@ func TestCLIAuthenticate(t *testing.T) {
 			var got string
 			splitTmp := strings.Split(string(tmp), "\n")
 			for i, str := range splitTmp {
-				if strings.HasPrefix(str, fmt.Sprintf("> ./pam_authd login socket=%s", socketPath)) {
+				if strings.HasPrefix(str, fmt.Sprintf("> ./pam_authd login socket=${%s}", socketPathEnv)) {
 					got = strings.Join(splitTmp[i:], "\n")
 					break
 				}
@@ -117,10 +117,9 @@ func TestCLIChangeAuthTok(t *testing.T) {
 	gpasswdOutput := filepath.Join(outDir, "gpasswd", "chauthtok.output")
 	groupsFile := filepath.Join(testutils.TestFamilyPath(t), "gpasswd.group")
 
-	socketPath := "/tmp/pam-cli-chauthtok-tests.sock"
+	const socketPathEnv = "AUTHD_TESTS_CLI_AUTHTOK_TESTS_SOCK"
 	ctx, cancel := context.WithCancel(context.Background())
-	_, stopped := testutils.RunDaemon(ctx, t, daemonPath,
-		testutils.WithSocketPath(socketPath),
+	socketPath, stopped := testutils.RunDaemon(ctx, t, daemonPath,
 		testutils.WithEnvironment(grouptests.GPasswdMockEnv(t, gpasswdOutput, groupsFile)...),
 	)
 	t.Cleanup(func() {
@@ -158,6 +157,7 @@ func TestCLIChangeAuthTok(t *testing.T) {
 			cmd := exec.Command("vhs", filepath.Join(currentDir, "testdata", "tapes", tc.tape+".tape"))
 			cmd.Env = testutils.AppendCovEnv(cmd.Env)
 			cmd.Env = append(cmd.Env, pathEnv)
+			cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", socketPathEnv, socketPath))
 			cmd.Dir = outDir
 
 			out, err := cmd.CombinedOutput()
@@ -170,7 +170,7 @@ func TestCLIChangeAuthTok(t *testing.T) {
 			var got string
 			splitTmp := strings.Split(string(tmp), "\n")
 			for i, str := range splitTmp {
-				if strings.HasPrefix(str, fmt.Sprintf("> ./pam_authd passwd socket=%s", socketPath)) {
+				if strings.HasPrefix(str, fmt.Sprintf("> ./pam_authd passwd socket=${%s}", socketPathEnv)) {
 					got = strings.Join(splitTmp[i:], "\n")
 					break
 				}

diff --git a/...ion-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_and_add_it_to_local_group b/...ion-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_and_add_it_to_local_group
@@ -1,4 +1,4 @@
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Username: user name
 
 
@@ -31,7 +31,7 @@ Username: user name
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Username: user-local-groups
 
 
@@ -64,7 +64,7 @@ Username: user-local-groups
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
   Select your provider
 
 > 1. local
@@ -97,7 +97,7 @@ Username: user-local-groups
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Gimme your password
 >
 
@@ -130,7 +130,7 @@ Gimme your password
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Gimme your password
 PAM Authenticate() for user "user-local-groups" exited with success
 PAM AcctMgmt() exited with success
@@ -163,7 +163,7 @@ PAM AcctMgmt() exited with success
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Gimme your password
 PAM Authenticate() for user "user-local-groups" exited with success
 PAM AcctMgmt() exited with success

diff --git a/...tion-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_and_offer_password_reset b/...tion-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_and_offer_password_reset
@@ -1,4 +1,4 @@
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Username: user name
 
 
@@ -31,7 +31,7 @@ Username: user name
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Username: user-can-reset
 
 
@@ -64,7 +64,7 @@ Username: user-can-reset
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
   Select your provider
 
 > 1. local
@@ -97,7 +97,7 @@ Username: user-can-reset
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Gimme your password
 >
 
@@ -130,7 +130,7 @@ Gimme your password
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password (3 days until mandatory)
 >
 >
@@ -163,7 +163,7 @@ Enter your new password (3 days until mandatory)
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password (3 days until mandatory)
 >
 >
@@ -196,7 +196,7 @@ Enter your new password (3 days until mandatory)
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password (3 days until mandatory)
 >
 >
@@ -229,7 +229,7 @@ PAM AcctMgmt() exited with success
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password (3 days until mandatory)
 >
 >

diff --git a/...ntegration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_and_reset_password b/...ntegration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_and_reset_password
@@ -1,4 +1,4 @@
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Username: user name
 
 
@@ -31,7 +31,7 @@ Username: user name
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Username: user-needs-reset
 
 
@@ -64,7 +64,7 @@ Username: user-needs-reset
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
   Select your provider
 
 > 1. local
@@ -97,7 +97,7 @@ Username: user-needs-reset
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Gimme your password
 >
 
@@ -130,7 +130,7 @@ Gimme your password
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password
 >
 >
@@ -163,7 +163,7 @@ Enter your new password
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password
 > *******
 >
@@ -196,7 +196,7 @@ Enter your new password
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password
 > *******
 > *******
@@ -229,7 +229,7 @@ Enter your new password
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password
 > *******
 PAM Authenticate() for user "user-needs-reset" exited with success
@@ -262,7 +262,7 @@ PAM AcctMgmt() exited with success
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Enter your new password
 > *******
 PAM Authenticate() for user "user-needs-reset" exited with success

diff --git a/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_successfully b/pam/integration-tests/testdata/TestCLIAuthenticate/golden/authenticate_user_successfully
@@ -1,4 +1,4 @@
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Username: user name
 
 
@@ -31,7 +31,7 @@ Username: user name
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Username: user1
 
 
@@ -64,7 +64,7 @@ Username: user1
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
   Select your provider
 
 > 1. local
@@ -97,7 +97,7 @@ Username: user1
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Gimme your password
 >
 
@@ -130,7 +130,7 @@ Gimme your password
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Gimme your password
 PAM Authenticate() for user "user1" exited with success
 PAM AcctMgmt() exited with success
@@ -163,7 +163,7 @@ PAM AcctMgmt() exited with success
 
 
 ────────────────────────────────────────────────────────────────────────────────
-> ./pam_authd login socket=/tmp/pam-cli-authenticate-tests.sock
+> ./pam_authd login socket=${AUTHD_TESTS_CLI_AUTHENTICATE_TESTS_SOCK}
 Gimme your password
 PAM Authenticate() for user "user1" exited with success
 PAM AcctMgmt() exited with success