18790: Error out instead of retrying if server is too old.

[arvados.git] / lib / controller / localdb / container_request_test.go

diff --git a/lib/controller/localdb/container_request_test.go b/lib/controller/localdb/container_request_test.go
index 2d89f58ab5325b96993155b0e24f1e6e48085e98..571b77f5e3b603bc40cc8be4cd31f451af0bb909 100644 (file)
--- a/lib/controller/localdb/container_request_test.go
+++ b/lib/controller/localdb/container_request_test.go
@@ -5,73 +5,18 @@
 package localdb
 
 import (
-       "context"
-
-       "git.arvados.org/arvados.git/lib/config"
-       "git.arvados.org/arvados.git/lib/controller/rpc"
-       "git.arvados.org/arvados.git/lib/ctrlctx"
        "git.arvados.org/arvados.git/sdk/go/arvados"
-       "git.arvados.org/arvados.git/sdk/go/arvadostest"
-       "git.arvados.org/arvados.git/sdk/go/auth"
-       "git.arvados.org/arvados.git/sdk/go/ctxlog"
        check "gopkg.in/check.v1"
 )
 
 var _ = check.Suite(&ContainerRequestSuite{})
 
 type ContainerRequestSuite struct {
-       cluster  *arvados.Cluster
-       localdb  *Conn
-       railsSpy *arvadostest.Proxy
-}
-
-func (s *ContainerRequestSuite) TearDownSuite(c *check.C) {
-       // Undo any changes/additions to the user database so they
-       // don't affect subsequent tests.
-       arvadostest.ResetEnv()
-       c.Check(arvados.NewClientFromEnv().RequestAndDecode(nil, "POST", "database/reset", nil, nil), check.IsNil)
-}
-
-func (s *ContainerRequestSuite) SetUpTest(c *check.C) {
-       cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
-       c.Assert(err, check.IsNil)
-       s.cluster, err = cfg.GetCluster("")
-       c.Assert(err, check.IsNil)
-       s.localdb = NewConn(context.Background(), s.cluster, (&ctrlctx.DBConnector{PostgreSQL: s.cluster.PostgreSQL}).GetDB)
-       s.railsSpy = arvadostest.NewProxy(c, s.cluster.Services.RailsAPI)
-       *s.localdb.railsProxy = *rpc.NewConn(s.cluster.ClusterID, s.railsSpy.URL, true, rpc.PassthroughTokenProvider)
-}
-
-func (s *ContainerRequestSuite) TearDownTest(c *check.C) {
-       s.railsSpy.Close()
-}
-
-func (s *ContainerRequestSuite) setUpVocabulary(c *check.C, testVocabulary string) {
-       if testVocabulary == "" {
-               testVocabulary = `{
-                       "strict_tags": false,
-                       "tags": {
-                               "IDTAGIMPORTANCES": {
-                                       "strict": true,
-                                       "labels": [{"label": "Importance"}, {"label": "Priority"}],
-                                       "values": {
-                                               "IDVALIMPORTANCES1": { "labels": [{"label": "Critical"}, {"label": "Urgent"}, {"label": "High"}] },
-                                               "IDVALIMPORTANCES2": { "labels": [{"label": "Normal"}, {"label": "Moderate"}] },
-                                               "IDVALIMPORTANCES3": { "labels": [{"label": "Low"}] }
-                                       }
-                               }
-                       }
-               }`
-       }
-       voc, err := arvados.NewVocabulary([]byte(testVocabulary), []string{})
-       c.Assert(err, check.IsNil)
-       s.localdb.vocabularyCache = voc
-       s.cluster.API.VocabularyPath = "foo"
+       localdbSuite
 }
 
 func (s *ContainerRequestSuite) TestCRCreateWithProperties(c *check.C) {
        s.setUpVocabulary(c, "")
-       ctx := auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
 
        tests := []struct {
                name    string
@@ -86,7 +31,7 @@ func (s *ContainerRequestSuite) TestCRCreateWithProperties(c *check.C) {
        for _, tt := range tests {
                c.Log(c.TestName()+" ", tt.name)
 
-               cnt, err := s.localdb.ContainerRequestCreate(ctx, arvados.CreateOptions{
+               cnt, err := s.localdb.ContainerRequestCreate(s.userctx, arvados.CreateOptions{
                        Select: []string{"uuid", "properties"},
                        Attrs: map[string]interface{}{
                                "command":         []string{"echo", "foo"},
@@ -117,7 +62,6 @@ func (s *ContainerRequestSuite) TestCRCreateWithProperties(c *check.C) {
 
 func (s *ContainerRequestSuite) TestCRUpdateWithProperties(c *check.C) {
        s.setUpVocabulary(c, "")
-       ctx := auth.NewContext(context.Background(), &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
 
        tests := []struct {
                name    string
@@ -131,7 +75,7 @@ func (s *ContainerRequestSuite) TestCRUpdateWithProperties(c *check.C) {
        }
        for _, tt := range tests {
                c.Log(c.TestName()+" ", tt.name)
-               cnt, err := s.localdb.ContainerRequestCreate(ctx, arvados.CreateOptions{
+               cnt, err := s.localdb.ContainerRequestCreate(s.userctx, arvados.CreateOptions{
                        Attrs: map[string]interface{}{
                                "command":         []string{"echo", "foo"},
                                "container_image": "arvados/apitestfixture:latest",
@@ -151,7 +95,7 @@ func (s *ContainerRequestSuite) TestCRUpdateWithProperties(c *check.C) {
                        },
                })
                c.Assert(err, check.IsNil)
-               cnt, err = s.localdb.ContainerRequestUpdate(ctx, arvados.UpdateOptions{
+               cnt, err = s.localdb.ContainerRequestUpdate(s.userctx, arvados.UpdateOptions{
                        UUID:   cnt.UUID,
                        Select: []string{"uuid", "properties"},
                        Attrs: map[string]interface{}{