17217: Remove crufty test util funcs.

[arvados.git] / sdk / go / dispatch / dispatch_test.go

diff --git a/sdk/go/dispatch/dispatch_test.go b/sdk/go/dispatch/dispatch_test.go
index c7e49380fb63a6c5c251477d44f46a5d409dac20..2a9d84639ef8ce1e4d9a987acdafdb947cafa961 100644 (file)
--- a/sdk/go/dispatch/dispatch_test.go
+++ b/sdk/go/dispatch/dispatch_test.go
@@ -7,9 +7,9 @@ package dispatch
 import (
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
-       "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-       "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/arvadosclient"
+       "git.arvados.org/arvados.git/sdk/go/arvadostest"
        . "gopkg.in/check.v1"
 )
 
@@ -18,14 +18,6 @@ var _ = Suite(&suite{})
 
 type suite struct{}
 
-func (s *suite) SetUpSuite(c *C) {
-       arvadostest.StartAPI()
-}
-
-func (s *suite) TearDownSuite(c *C) {
-       arvadostest.StopAPI()
-}
-
 func (s *suite) TestTrackContainer(c *C) {
        arv, err := arvadosclient.MakeArvadosClient()
        c.Assert(err, Equals, nil)
@@ -35,11 +27,12 @@ func (s *suite) TestTrackContainer(c *C) {
        time.AfterFunc(10*time.Second, func() { done <- false })
        d := &Dispatcher{
                Arv: arv,
-               RunContainer: func(dsp *Dispatcher, ctr arvados.Container, status <-chan arvados.Container) {
+               RunContainer: func(dsp *Dispatcher, ctr arvados.Container, status <-chan arvados.Container) error {
                        for ctr := range status {
                                c.Logf("%#v", ctr)
                        }
                        done <- true
+                       return nil
                },
        }
        d.TrackContainer(arvadostest.QueuedContainerUUID)