Merge branch 'master' into 7490-datamanager-dont-die-return-error

Conflicts:
	services/datamanager/datamanager_test.go

diff --combined services/datamanager/datamanager_test.go
index 6ceb1e625eb3a458e056771e1de2307f15e3c529,685f94c88f3a35c33f6aa986e85701a5853e5d32..26a2fbf92ba124c8cbe4e534c39931107f084dca
--- 1/services/datamanager/datamanager_test.go
--- 2/services/datamanager/datamanager_test.go
+++ b/services/datamanager/datamanager_test.go
@@@ -16,11 -16,6 +16,6 @@@ import 
        "time"
  )
  
- const (
-       ActiveUserToken = "3kg6k6lzmp9kj5cpkcoxie963cmvjahbt2fod9zru30k1jqdmi"
-       AdminToken      = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h"
- )
- 
  var arv arvadosclient.ArvadosClient
  var keepClient *keepclient.KeepClient
  var keepServers []string
@@@ -33,11 -28,8 +28,12 @@@ func SetupDataManagerTest(t *testing.T
        arvadostest.StartAPI()
        arvadostest.StartKeep(2, false)
  
 -      arv = makeArvadosClient()
 +      var err error
 +      arv, err = makeArvadosClient()
 +      if err != nil {
 +              t.Fatalf("Error making arvados client: %s", err)
 +      }
+       arv.ApiToken = arvadostest.DataManagerToken
  
        // keep client
        keepClient = &keepclient.KeepClient{
@@@ -48,7 -40,7 +44,7 @@@
        }
  
        // discover keep services
 -      if err := keepClient.DiscoverKeepServers(); err != nil {
 +      if err = keepClient.DiscoverKeepServers(); err != nil {
                t.Fatalf("Error discovering keep services: %s", err)
        }
        keepServers = []string{}
@@@ -128,7 -120,18 +124,18 @@@ func getFirstLocatorFromCollection(t *t
        return match[1] + "+" + match[2]
  }
  
+ func switchToken(t string) func() {
+       orig := arv.ApiToken
+       restore := func() {
+               arv.ApiToken = orig
+       }
+       arv.ApiToken = t
+       return restore
+ }
+ 
  func getCollection(t *testing.T, uuid string) Dict {
+       defer switchToken(arvadostest.AdminToken)()
+ 
        getback := make(Dict)
        err := arv.Get("collections", uuid, nil, &getback)
        if err != nil {
@@@ -142,6 -145,8 +149,8 @@@
  }
  
  func updateCollection(t *testing.T, uuid string, paramName string, paramValue string) {
+       defer switchToken(arvadostest.AdminToken)()
+ 
        err := arv.Update("collections", uuid, arvadosclient.Dict{
                "collection": arvadosclient.Dict{
                        paramName: paramValue,
@@@ -156,6 -161,8 +165,8 @@@
  type Dict map[string]interface{}
  
  func deleteCollection(t *testing.T, uuid string) {
+       defer switchToken(arvadostest.AdminToken)()
+ 
        getback := make(Dict)
        err := arv.Delete("collections", uuid, nil, &getback)
        if err != nil {
@@@ -179,7 -186,7 +190,7 @@@ func getBlockIndexesForServer(t *testin
        path := keepServers[i] + "/index"
        client := http.Client{}
        req, err := http.NewRequest("GET", path, nil)
-       req.Header.Add("Authorization", "OAuth2 "+AdminToken)
+       req.Header.Add("Authorization", "OAuth2 "+arvadostest.DataManagerToken)
        req.Header.Add("Content-Type", "application/octet-stream")
        resp, err := client.Do(req)
        defer resp.Body.Close()
@@@ -301,7 -308,7 +312,7 @@@ func backdateBlocks(t *testing.T, oldUn
  func getStatus(t *testing.T, path string) interface{} {
        client := http.Client{}
        req, err := http.NewRequest("GET", path, nil)
-       req.Header.Add("Authorization", "OAuth2 "+AdminToken)
+       req.Header.Add("Authorization", "OAuth2 "+arvadostest.DataManagerToken)
        req.Header.Add("Content-Type", "application/octet-stream")
        resp, err := client.Do(req)
        if err != nil {
@@@ -508,7 -515,7 +519,7 @@@ func TestRunDatamanagerAsNonAdminUser(
        defer TearDownDataManagerTest(t)
        SetupDataManagerTest(t)
  
-       arv.ApiToken = ActiveUserToken
+       arv.ApiToken = arvadostest.ActiveToken
  
        err := singlerun(arv)
        if err == nil {