X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3198e16b3e7ae214a2e739c1676d7550c5e6209c..35db495717a628e0a6ef52a453b8d8ced793c41b:/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 bf37409f6b..3cbf14fe0b 100644
--- 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"
 )
 
+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")
 	}
+	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.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)
 }
@@ -28,10 +39,16 @@ func (s *LDAPSuite) TestLoginLDAPBuiltin(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.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)
 }