Better comments

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

diff --git a/lib/controller/cmd.go b/lib/controller/cmd.go
index c6b53eb8f6d930f113936449dbb762740f344e8d..7ab7f5305b4fe83113d1a47f499f7d3eb8298804 100644 (file)
--- 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 64d5fb5625a202c29cb58b39af698043de8eb95f..a479e4476daa96b18112f53365b71d1c41c1260c 100644 (file)
--- 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) {