[arvados] updated: 2.7.0-695-g17d60c7ce9

[git repository hosting]

Summary of changes:
 lib/controller/rpc/conn_test.go    | 31 ++++++++++++++++++++++++++++++-
 services/api/config/application.rb |  3 ---
 2 files changed, 30 insertions(+), 4 deletions(-)

       via  17d60c7ce9d7a358ab59c43d5c8d3afe506e5dad (commit)
       via  a86a6544f54720c5941a32187235ef5287caee07 (commit)
      from  80360e3149727e7c3249468782ce605ff3d42a5e (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 17d60c7ce9d7a358ab59c43d5c8d3afe506e5dad
Author: Tom Clegg <tom at curii.com>
Date:   Mon Oct 16 11:55:16 2023 -0400

    20300: Delete superfluous config override.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/api/config/application.rb b/services/api/config/application.rb
index 9b024c3a82..716383f203 100644
--- a/services/api/config/application.rb
+++ b/services/api/config/application.rb
@@ -64,9 +64,6 @@ module Server
     # which cannot read 7.0-format cache files.
     config.active_support.cache_format_version = 6.1
 
-    # Delete when switching to 7.0 framework defaults.
-    config.active_support.disable_to_s_conversion = true
-
     # Before using the filesystem backend for Rails.cache, check
     # whether we own the relevant directory. If we don't, using it is
     # likely to either fail or (if we're root) pollute it and cause

commit a86a6544f54720c5941a32187235ef5287caee07
Author: Tom Clegg <tom at curii.com>
Date:   Mon Oct 16 11:51:08 2023 -0400

    20300: Revive logout/redirect test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/rpc/conn_test.go b/lib/controller/rpc/conn_test.go
index 18cb4ef6ed..0d1200fe12 100644
--- a/lib/controller/rpc/conn_test.go
+++ b/lib/controller/rpc/conn_test.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"testing"
 
+	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
@@ -39,13 +40,26 @@ type RPCSuite struct {
 func (s *RPCSuite) SetUpTest(c *check.C) {
 	ctx := ctxlog.Context(context.Background(), ctxlog.TestLogger(c))
 	s.ctx = context.WithValue(ctx, contextKeyTestTokens, []string{arvadostest.ActiveToken})
-	s.conn = NewConn("zzzzz", &url.URL{Scheme: "https", Host: os.Getenv("ARVADOS_TEST_API_HOST")}, true, func(ctx context.Context) ([]string, error) {
+}
+
+func (s *RPCSuite) setupConn(c *check.C, host string) {
+	s.conn = NewConn("zzzzz", &url.URL{Scheme: "https", Host: host}, true, func(ctx context.Context) ([]string, error) {
 		tokens, _ := ctx.Value(contextKeyTestTokens).([]string)
 		return tokens, nil
 	})
 }
 
+func (s *RPCSuite) workbench2URL(c *check.C) string {
+	loader := config.NewLoader(nil, s.log)
+	cfg, err := loader.Load()
+	c.Assert(err, check.IsNil)
+	cluster, err := cfg.GetCluster("")
+	c.Assert(err, check.IsNil)
+	return cluster.Services.Workbench2.ExternalURL.String()
+}
+
 func (s *RPCSuite) TestRailsLogin404(c *check.C) {
+	s.setupConn(c, os.Getenv("ARVADOS_TEST_API_HOST"))
 	s.ctx = context.Background()
 	opts := arvados.LoginOptions{
 		ReturnTo: "https://foo.example.com/bar",
@@ -55,6 +69,7 @@ func (s *RPCSuite) TestRailsLogin404(c *check.C) {
 }
 
 func (s *RPCSuite) TestRailsLogout404(c *check.C) {
+	s.setupConn(c, os.Getenv("ARVADOS_TEST_API_HOST"))
 	s.ctx = context.Background()
 	opts := arvados.LogoutOptions{
 		ReturnTo: "https://foo.example.com/bar",
@@ -63,7 +78,20 @@ func (s *RPCSuite) TestRailsLogout404(c *check.C) {
 	c.Check(err.(*arvados.TransactionError).StatusCode, check.Equals, 404)
 }
 
+func (s *RPCSuite) TestControllerLogout(c *check.C) {
+	s.setupConn(c, os.Getenv("ARVADOS_API_HOST"))
+	s.ctx = context.Background()
+	url := s.workbench2URL(c)
+	opts := arvados.LogoutOptions{
+		ReturnTo: url,
+	}
+	resp, err := s.conn.Logout(s.ctx, opts)
+	c.Check(err, check.IsNil)
+	c.Check(resp.RedirectLocation, check.Equals, url)
+}
+
 func (s *RPCSuite) TestCollectionCreate(c *check.C) {
+	s.setupConn(c, os.Getenv("ARVADOS_TEST_API_HOST"))
 	coll, err := s.conn.CollectionCreate(s.ctx, arvados.CreateOptions{Attrs: map[string]interface{}{
 		"owner_uuid":         arvadostest.ActiveUserUUID,
 		"portable_data_hash": "d41d8cd98f00b204e9800998ecf8427e+0",
@@ -73,6 +101,7 @@ func (s *RPCSuite) TestCollectionCreate(c *check.C) {
 }
 
 func (s *RPCSuite) TestSpecimenCRUD(c *check.C) {
+	s.setupConn(c, os.Getenv("ARVADOS_TEST_API_HOST"))
 	sp, err := s.conn.SpecimenCreate(s.ctx, arvados.CreateOptions{Attrs: map[string]interface{}{
 		"owner_uuid": arvadostest.ActiveUserUUID,
 		"properties": map[string]string{"foo": "bar"},

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


hooks/post-receive
--