[ARVADOS] updated: 1.3.0-2558-gca1eb6487

[Git user]

Summary of changes:
 lib/controller/localdb/login_ldap_docker_test.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

       via  ca1eb648712232558014d648939868b2a902558a (commit)
      from  28e68f813bd7c48847c39a9e07d66ff5cf61662d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ca1eb648712232558014d648939868b2a902558a
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Wed May 13 16:12:39 2020 -0400

    15881: Skip docker tests if docker is not available.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/controller/localdb/login_ldap_docker_test.go b/lib/controller/localdb/login_ldap_docker_test.go
index bf37409f6..79b5f1615 100644
--- a/lib/controller/localdb/login_ldap_docker_test.go
+++ b/lib/controller/localdb/login_ldap_docker_test.go
@@ -12,10 +12,18 @@ 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")
+	}
 	cmd := exec.Command("bash", "login_ldap_docker_test.sh")
 	cmd.Stdout = os.Stderr
 	cmd.Stderr = os.Stderr
@@ -28,6 +36,9 @@ 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")
+	}
 	cmd := exec.Command("bash", "login_ldap_docker_test.sh")
 	cmd.Stdout = os.Stderr
 	cmd.Stderr = os.Stderr

-----------------------------------------------------------------------


hooks/post-receive
--