projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20647: Fix duplicate response headers via reverse proxy.
[arvados.git]
/
lib
/
controller
/
localdb
/
login_ldap_docker_test.go
diff --git
a/lib/controller/localdb/login_ldap_docker_test.go
b/lib/controller/localdb/login_ldap_docker_test.go
index 79b5f16158ab0c39cba73822cb534bd9303ce24c..3cbf14fe0b0c11694bd95831179f3f0b7f6eb586 100644
(file)
--- a/
lib/controller/localdb/login_ldap_docker_test.go
+++ b/
lib/controller/localdb/login_ldap_docker_test.go
@@
-24,10
+24,13
@@
func (s *LDAPSuite) TestLoginLDAPViaPAM(c *check.C) {
if !haveDocker() {
c.Skip("skipping docker test because docker is not available")
}
if !haveDocker() {
c.Skip("skipping docker test because docker is not available")
}
+ pgproxy := newPgProxy(c, s.cluster)
+ defer pgproxy.Close()
+
cmd := exec.Command("bash", "login_ldap_docker_test.sh")
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
cmd := exec.Command("bash", "login_ldap_docker_test.sh")
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
- cmd.Env = append(os.Environ(), "config_method=pam")
+ cmd.Env = append(os.Environ(), "config_method=pam"
, "pgport="+pgproxy.Port()
)
err := cmd.Run()
c.Check(err, check.IsNil)
}
err := cmd.Run()
c.Check(err, check.IsNil)
}
@@
-39,10
+42,13
@@
func (s *LDAPSuite) TestLoginLDAPBuiltin(c *check.C) {
if !haveDocker() {
c.Skip("skipping docker test because docker is not available")
}
if !haveDocker() {
c.Skip("skipping docker test because docker is not available")
}
+ pgproxy := newPgProxy(c, s.cluster)
+ defer pgproxy.Close()
+
cmd := exec.Command("bash", "login_ldap_docker_test.sh")
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
cmd := exec.Command("bash", "login_ldap_docker_test.sh")
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
- cmd.Env = append(os.Environ(), "config_method=ldap")
+ cmd.Env = append(os.Environ(), "config_method=ldap"
, "pgport="+pgproxy.Port()
)
err := cmd.Run()
c.Check(err, check.IsNil)
}
err := cmd.Run()
c.Check(err, check.IsNil)
}