projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19388: Add tests for activity logs.
[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 bf37409f6b2a418675e60e1f0e68b82afc5a7ecc..3cbf14fe0b0c11694bd95831179f3f0b7f6eb586 100644
(file)
--- a/
lib/controller/localdb/login_ldap_docker_test.go
+++ b/
lib/controller/localdb/login_ldap_docker_test.go
@@
-12,14
+12,25
@@
import (
check "gopkg.in/check.v1"
)
check "gopkg.in/check.v1"
)
+func haveDocker() bool {
+ _, err := exec.Command("docker", "info").CombinedOutput()
+ return err == nil
+}
+
func (s *LDAPSuite) TestLoginLDAPViaPAM(c *check.C) {
if testing.Short() {
c.Skip("skipping docker test in short mode")
}
func (s *LDAPSuite) TestLoginLDAPViaPAM(c *check.C) {
if testing.Short() {
c.Skip("skipping docker test in short mode")
}
+ 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)
}
@@
-28,10
+39,16
@@
func (s *LDAPSuite) TestLoginLDAPBuiltin(c *check.C) {
if testing.Short() {
c.Skip("skipping docker test in short mode")
}
if testing.Short() {
c.Skip("skipping docker test in short mode")
}
+ 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)
}