[arvados] updated: 2.1.0-2998-g15043a682

[git repository hosting]

Summary of changes:
 lib/controller/dblock/dblock_test.go | 2 +-
 lib/controller/handler_test.go       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

       via  15043a6825ecd62ccb2272025384474a235b30cc (commit)
       via  8a8f27d60f97047483072539837785ea917b286d (commit)
      from  08bf53a3396ab74e805d468ccbb9c0cea86a3d5a (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 15043a6825ecd62ccb2272025384474a235b30cc
Author: Tom Clegg <tom at curii.com>
Date:   Fri Oct 28 14:33:45 2022 -0400

    18071: Fix tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index c9999fa28..a240b195e 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -284,6 +284,7 @@ func (s *HandlerSuite) TestLogoutGoogle(c *check.C) {
 }
 
 func (s *HandlerSuite) TestValidateV1APIToken(c *check.C) {
+	c.Assert(s.handler.CheckHealth(), check.IsNil)
 	req := httptest.NewRequest("GET", "/arvados/v1/users/current", nil)
 	user, ok, err := s.handler.validateAPItoken(req, arvadostest.ActiveToken)
 	c.Assert(err, check.IsNil)
@@ -295,6 +296,7 @@ func (s *HandlerSuite) TestValidateV1APIToken(c *check.C) {
 }
 
 func (s *HandlerSuite) TestValidateV2APIToken(c *check.C) {
+	c.Assert(s.handler.CheckHealth(), check.IsNil)
 	req := httptest.NewRequest("GET", "/arvados/v1/users/current", nil)
 	user, ok, err := s.handler.validateAPItoken(req, arvadostest.ActiveTokenV2)
 	c.Assert(err, check.IsNil)
@@ -337,6 +339,7 @@ func (s *HandlerSuite) TestLogTokenUUID(c *check.C) {
 }
 
 func (s *HandlerSuite) TestCreateAPIToken(c *check.C) {
+	c.Assert(s.handler.CheckHealth(), check.IsNil)
 	req := httptest.NewRequest("GET", "/arvados/v1/users/current", nil)
 	auth, err := s.handler.createAPItoken(req, arvadostest.ActiveUserUUID, nil)
 	c.Assert(err, check.IsNil)

commit 8a8f27d60f97047483072539837785ea917b286d
Author: Tom Clegg <tom at curii.com>
Date:   Fri Oct 28 14:18:59 2022 -0400

    18071: Relax test timeout.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/dblock/dblock_test.go b/lib/controller/dblock/dblock_test.go
index 6079df6f8..b10b2a3ac 100644
--- a/lib/controller/dblock/dblock_test.go
+++ b/lib/controller/dblock/dblock_test.go
@@ -44,7 +44,7 @@ func (s *suite) SetUpSuite(c *check.C) {
 }
 
 func (s *suite) TestLock(c *check.C) {
-	retryDelay = time.Millisecond
+	retryDelay = 10 * time.Millisecond
 
 	var logbuf bytes.Buffer
 	logger := ctxlog.New(&logbuf, "text", "debug")

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


hooks/post-receive
--