Merge branch '17351-arvput-keepclient-storage-support'

[arvados.git] / lib / crunchrun / integration_test.go

diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index 04a15bcea7bf97c11a6dd66af52d641967ed0a0a..c688248c64fbdc26330144ebeafb3abf8c42edc6 100644 (file)
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -36,6 +36,11 @@ type integrationSuite struct {
 }
 
 func (s *integrationSuite) SetUpSuite(c *C) {
+       _, err := exec.LookPath("docker")
+       if err != nil {
+               c.Skip("looks like docker is not installed")
+       }
+
        arvadostest.StartKeep(2, true)
 
        out, err := exec.Command("docker", "load", "--input", busyboxDockerImage(c)).CombinedOutput()
@@ -74,6 +79,10 @@ func (s *integrationSuite) SetUpSuite(c *C) {
 }
 
 func (s *integrationSuite) TearDownSuite(c *C) {
+       if s.client == nil {
+               // didn't set up
+               return
+       }
        err := s.client.RequestAndDecode(nil, "POST", "database/reset", nil, nil)
        c.Check(err, IsNil)
 }