From 0999dbe4a8bb91e316dd09ff25a00fcf20309ee4 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 1 Jul 2020 14:48:29 -0400 Subject: [PATCH] 15348: Use normal (packaged) path in docker test case. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/pam/docker_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pam/docker_test.go b/lib/pam/docker_test.go index eb139f145f..5b1755496b 100644 --- a/lib/pam/docker_test.go +++ b/lib/pam/docker_test.go @@ -77,9 +77,9 @@ Default: yes Priority: 256 Auth-Type: Primary Auth: - [success=end default=ignore] /usr/lib/security/pam_arvados.so %s testvm2.shell insecure + [success=end default=ignore] /usr/lib/pam_arvados.so %s testvm2.shell insecure Auth-Initial: - [success=end default=ignore] /usr/lib/security/pam_arvados.so %s testvm2.shell insecure + [success=end default=ignore] /usr/lib/pam_arvados.so %s testvm2.shell insecure `, proxyhost, proxyhost) err = ioutil.WriteFile(s.tmpdir+"/conffile", []byte(confdata), 0755) c.Assert(err, check.IsNil) @@ -107,7 +107,7 @@ func (s *DockerSuite) runTestClient(c *check.C, args ...string) (stdout, stderr cmd := exec.Command("docker", append([]string{ "run", "--rm", "--add-host", "zzzzz.arvadosapi.com:" + s.hostip, - "-v", s.tmpdir + "/pam_arvados.so:/usr/lib/security/pam_arvados.so:ro", + "-v", s.tmpdir + "/pam_arvados.so:/usr/lib/pam_arvados.so:ro", "-v", s.tmpdir + "/conffile:/usr/share/pam-configs/arvados:ro", "-v", s.tmpdir + "/testclient:/testclient:ro", "debian:buster", -- 2.30.2