X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4b593edcfee19c464e10baacd68fb267c7f22450..3fa6aa4043286ad61e5f29c136d3cc2942e8750d:/lib/crunchrun/executor_test.go

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index fc9f5b36e7..ea6e610d8b 100644
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -8,7 +8,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -16,36 +15,11 @@ import (
 	"time"
 
 	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
 	"golang.org/x/net/context"
 	. "gopkg.in/check.v1"
 )
 
-func busyboxDockerImage(c *C) string {
-	fnm := "busybox_uclibc.tar"
-	cachedir := c.MkDir()
-	cachefile := cachedir + "/" + fnm
-	if _, err := os.Stat(cachefile); err == nil {
-		return cachefile
-	}
-
-	f, err := ioutil.TempFile(cachedir, "")
-	c.Assert(err, IsNil)
-	defer f.Close()
-	defer os.Remove(f.Name())
-
-	resp, err := http.Get("https://cache.arvados.org/" + fnm)
-	c.Assert(err, IsNil)
-	defer resp.Body.Close()
-	_, err = io.Copy(f, resp.Body)
-	c.Assert(err, IsNil)
-	err = f.Close()
-	c.Assert(err, IsNil)
-	err = os.Rename(f.Name(), cachefile)
-	c.Assert(err, IsNil)
-
-	return cachefile
-}
-
 type nopWriteCloser struct{ io.Writer }
 
 func (nopWriteCloser) Close() error { return nil }
@@ -73,7 +47,7 @@ func (s *executorSuite) SetUpTest(c *C) {
 		Stdout:      nopWriteCloser{&s.stdout},
 		Stderr:      nopWriteCloser{&s.stderr},
 	}
-	err := s.executor.LoadImage("", busyboxDockerImage(c), arvados.Container{}, "", nil)
+	err := s.executor.LoadImage("", arvadostest.BusyboxDockerImage(c), arvados.Container{}, "", nil)
 	c.Assert(err, IsNil)
 }