17014: Add mock response to users/current.

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

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index d50bc14537ce149b45b0ed7b6a3945eacf1e4de8..a479e4476daa96b18112f53365b71d1c41c1260c 100644 (file)
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -510,24 +510,23 @@ func (s *IntegrationSuite) TestRuntimeTokenInCR(c *check.C) {
                }
                cr, err := conn1.ContainerRequestCreate(rootctx1, arvados.CreateOptions{Attrs: rq})
                if tt.expectAToGetAValidCR {
-                       c.Assert(err, check.IsNil)
-                       c.Assert(cr, check.NotNil)
-                       c.Assert(cr.UUID, check.Not(check.Equals), "")
+                       c.Check(err, check.IsNil)
+                       c.Check(cr, check.NotNil)
+                       c.Check(cr.UUID, check.Not(check.Equals), "")
                }
 
                if tt.expectedToken == nil {
-                       break
+                       continue
                }
 
                c.Logf("cr.UUID: %s", cr.UUID)
                row := dbconn.QueryRowContext(rootctx1, `SELECT runtime_token from container_requests where uuid=$1`, cr.UUID)
-               c.Assert(row, check.NotNil)
-               // runtimeToken is *string and not a string because the database has a NULL column for this
-               var runtimeToken *string
-               err = row.Scan(&runtimeToken)
-               c.Assert(err, check.IsNil)
-               c.Assert(runtimeToken, check.NotNil)
-               c.Assert(*runtimeToken, check.DeepEquals, *tt.expectedToken)
+               c.Check(row, check.NotNil)
+               var token sql.NullString
+               row.Scan(&token)
+               if c.Check(token.Valid, check.Equals, true) {
+                       c.Check(token.String, check.Equals, *tt.expectedToken)
+               }
        }
 }