[ARVADOS] updated: 2.1.0-103-g5ba51e655

[Git user]

Summary of changes:
 lib/controller/cmd.go              | 2 +-
 lib/controller/integration_test.go | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

       via  5ba51e655dc64f55e2c21bd0031ef1a830576667 (commit)
      from  56135cbc4260212c1e653f1d2476f765526f045e (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 5ba51e655dc64f55e2c21bd0031ef1a830576667
Author: Nico Cesar <nico at nicocesar.com>
Date:   Tue Nov 17 14:14:32 2020 -0500

    Better comments
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/lib/controller/cmd.go b/lib/controller/cmd.go
index c6b53eb8f..7ab7f5305 100644
--- a/lib/controller/cmd.go
+++ b/lib/controller/cmd.go
@@ -13,7 +13,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-// Command intanciates a cmd.Handler with the service.Command used in package cmd
+// Command starts a controller service. See cmd/arvados-server/cmd.go
 var Command cmd.Handler = service.Command(arvados.ServiceNameController, newHandler)
 
 func newHandler(_ context.Context, cluster *arvados.Cluster, _ string, _ *prometheus.Registry) service.Handler {
diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go
index 64d5fb562..a479e4476 100644
--- a/lib/controller/integration_test.go
+++ b/lib/controller/integration_test.go
@@ -510,9 +510,9 @@ 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 {
@@ -521,7 +521,7 @@ 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)
+		c.Check(row, check.NotNil)
 		var token sql.NullString
 		row.Scan(&token)
 		if c.Check(token.Valid, check.Equals, true) {

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


hooks/post-receive
--