[ARVADOS] updated: 1.3.0-1998-gef48a49d3

[Git user]

Summary of changes:
 lib/dispatchcloud/container/queue_test.go | 8 ++++++++
 1 file changed, 8 insertions(+)

       via  ef48a49d302ca25136bbb2ed96319a8b56b46250 (commit)
      from  6162a7fc5b213446b808313770d0d7e491fa5723 (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 ef48a49d302ca25136bbb2ed96319a8b56b46250
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Thu Dec 19 09:23:01 2019 -0500

    15942: Ensure container with no suitable type is never in queue.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/dispatchcloud/container/queue_test.go b/lib/dispatchcloud/container/queue_test.go
index 085e98a5f..971fe9490 100644
--- a/lib/dispatchcloud/container/queue_test.go
+++ b/lib/dispatchcloud/container/queue_test.go
@@ -121,10 +121,18 @@ func (suite *IntegrationSuite) TestCancelIfNoInstanceType(c *check.C) {
 	// will have state=Cancelled or just disappear from the queue.
 	suite.waitfor(c, time.Second, func() bool {
 		cq.Update()
+
+		// Container should never be added to queue
+		_, ok := cq.Get(arvadostest.QueuedContainerUUID)
+		c.Check(ok, check.Equals, false)
+
 		err := client.RequestAndDecode(&ctr, "GET", "arvados/v1/containers/"+arvadostest.QueuedContainerUUID, nil, nil)
 		return err == nil && ctr.State == arvados.ContainerStateCancelled
 	})
 	c.Check(ctr.RuntimeStatus["error"], check.Equals, `no suitable instance type`)
+
+	_, ok := cq.Get(arvadostest.QueuedContainerUUID)
+	c.Check(ok, check.Equals, false)
 }
 
 func (suite *IntegrationSuite) waitfor(c *check.C, timeout time.Duration, fn func() bool) {

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


hooks/post-receive
--