[arvados] updated: 2.7.0-5322-g41b006205f

[git repository hosting]

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

       via  41b006205fc8f0d841e0f9ee76d3819930f1acf6 (commit)
      from  e634df22d847fd535d0daefc9fee5b5e2ca89ac3 (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 41b006205fc8f0d841e0f9ee76d3819930f1acf6
Author: Brett Smith <brett.smith at curii.com>
Date:   Wed Nov 8 11:13:01 2023 -0500

    21021: WIP 2, minor test cleanups
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/lib/controller/federation/login_test.go b/lib/controller/federation/login_test.go
index 63ff643368..ab39619c79 100644
--- a/lib/controller/federation/login_test.go
+++ b/lib/controller/federation/login_test.go
@@ -8,10 +8,8 @@ import (
 	"context"
 	"net/url"
 
-	"git.arvados.org/arvados.git/lib/ctrlctx"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
-	"git.arvados.org/arvados.git/sdk/go/auth"
 	check "gopkg.in/check.v1"
 )
 
diff --git a/lib/controller/federation/logout_test.go b/lib/controller/federation/logout_test.go
index cd9a364291..0040da5c92 100644
--- a/lib/controller/federation/logout_test.go
+++ b/lib/controller/federation/logout_test.go
@@ -24,7 +24,7 @@ type LogoutStub struct {
 
 func (as *LogoutStub) CheckCalls(c *check.C, returnURL url.URL) bool {
 	actual := as.APIStub.Calls(as.APIStub.Logout)
-	allOK := c.Check(len(actual), check.Not(check.Equals), 0,
+	allOK := c.Check(actual, check.Not(check.HasLen), 0,
 		check.Commentf("Logout stub never called"))
 	expected := returnURL.String()
 	for _, call := range actual {
@@ -128,7 +128,7 @@ func (s *LogoutSuite) TestRemoteLogoutError(c *check.C) {
 	loginStub := s.setupStub(c, "zhome", url.URL{}, expErr)
 	returnTo := s.goodReturnURL("TestRemoteLogoutError")
 	_, err := s.fed.Logout(s.ctx, arvados.LogoutOptions{ReturnTo: returnTo.String()})
-	c.Check(err, check.ErrorMatches, `.*: 500 Internal Server Error: TestRemoteLogoutError expErr`)
+	c.Check(err, check.Equals, expErr)
 	loginStub.CheckCalls(c, returnTo)
 }
 
@@ -153,7 +153,9 @@ func (s *LogoutSuite) TestRemoteLogoutLocalError(c *check.C) {
 	localStub := s.setupStub(c, "aaaaa", url.URL{}, expErr)
 	returnTo := s.goodReturnURL("TestRemoteLogoutLocalError")
 	_, err := s.fed.Logout(s.ctx, arvados.LogoutOptions{ReturnTo: returnTo.String()})
-	c.Check(err, check.ErrorMatches, `.*: 500 Internal Server Error: TestRemoteLogoutLocalError expErr`)
+	c.Check(err, check.Equals, expErr)
 	loginStub.CheckCalls(c, returnTo)
 	localStub.CheckCalls(c, returnTo)
 }
+
+// FIXME: Add v2 token tests

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


hooks/post-receive
--