[arvados] updated: 2.7.0-6102-g35d4eea994

[git repository hosting]

Summary of changes:
 lib/dispatchcloud/dispatcher_test.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

       via  35d4eea994c98b4bb65111c9da6e57abbc7e014f (commit)
      from  99a1c26447c7cc06f27ce9b79690cdb64752f2ca (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 35d4eea994c98b4bb65111c9da6e57abbc7e014f
Author: Tom Clegg <tom at curii.com>
Date:   Wed Mar 6 10:30:28 2024 -0500

    21123: Fix inadvertent use of run-tests db in dispatcher tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index e7465d65b1..3c23d81d58 100644
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -129,6 +129,10 @@ func (s *DispatcherSuite) SetUpTest(c *check.C) {
 		ArvClient: arvClient,
 		AuthToken: arvadostest.AdminToken,
 		Registry:  prometheus.NewRegistry(),
+		// Providing a stub queue here prevents
+		// disp.initialize() from making a real one that uses
+		// the integration test servers/database.
+		queue: &test.Queue{},
 	}
 	// Test cases can modify s.cluster before calling
 	// initialize(), and then modify private state before calling
@@ -329,7 +333,6 @@ func (s *DispatcherSuite) TestManagementAPI_Permissions(c *check.C) {
 	s.cluster.ManagementToken = "abcdefgh"
 	Drivers["test"] = s.stubDriver
 	s.disp.setupOnce.Do(s.disp.initialize)
-	s.disp.queue = &test.Queue{}
 	go s.disp.run()
 
 	for _, token := range []string{"abc", ""} {
@@ -351,7 +354,6 @@ func (s *DispatcherSuite) TestManagementAPI_Disabled(c *check.C) {
 	s.cluster.ManagementToken = ""
 	Drivers["test"] = s.stubDriver
 	s.disp.setupOnce.Do(s.disp.initialize)
-	s.disp.queue = &test.Queue{}
 	go s.disp.run()
 
 	for _, token := range []string{"abc", ""} {
@@ -478,7 +480,6 @@ func (s *DispatcherSuite) TestManagementAPI_Instances(c *check.C) {
 	s.cluster.Containers.CloudVMs.TimeoutBooting = arvados.Duration(time.Second)
 	Drivers["test"] = s.stubDriver
 	s.disp.setupOnce.Do(s.disp.initialize)
-	s.disp.queue = &test.Queue{}
 	go s.disp.run()
 	defer s.disp.Close()
 

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


hooks/post-receive
--