[ARVADOS] updated: 2.1.0-101-g5bad4d727

[Git user]

Summary of changes:
 lib/controller/integration_test.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

       via  5bad4d72729d0f6e4649abf8e72991a9b0e6573f (commit)
      from  6f2ae883a11194c27fba3498106945595fba3471 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5bad4d72729d0f6e4649abf8e72991a9b0e6573f
Author: Nico Cesar <nico at nicocesar.com>
Date:   Tue Nov 17 12:23:09 2020 -0500

    addressing https://dev.arvados.org/issues/17014#note-8 Tests
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index d50bc1453..998b177d1 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -522,12 +522,11 @@ func (s *IntegrationSuite) TestRuntimeTokenInCR(c *check.C) {
 		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)
+		var token sql.NullString
+		row.Scan(&token)
+		if c.Check(token.Valid, check.Equals, true) {
+			c.Check(token.String, check.Equals, *tt.expectedToken)
+		}
 	}
 }
 

-----------------------------------------------------------------------


hooks/post-receive
--