From 6d6fe074691dedd5ce125a743427c1055068c538 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 4 Oct 2024 17:32:44 -0400 Subject: [PATCH] Make integration test check more flexible Make test accept the case of: Queued, waiting for dispatch Locked, waiting for dispatch no issue # Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- lib/controller/integration_test.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/controller/integration_test.go b/lib/controller/integration_test.go index 7c3459b168..859b2b02c8 100644 --- a/lib/controller/integration_test.go +++ b/lib/controller/integration_test.go @@ -1309,15 +1309,16 @@ func (s *IntegrationSuite) runContainer(c *check.C, clusterID string, token stri c.Check(ctr.ExitCode, check.Equals, expectExitCode) err = ac.RequestAndDecode(&outcoll, "GET", "/arvados/v1/collections/"+cr.OutputUUID, nil, nil) c.Assert(err, check.IsNil) - c.Check(allStatus, check.Matches, `Queued, waiting for dispatch\n`+ - // Occasionally the dispatcher will - // unlock/retry, and we get state/status from - // database/dispatcher via separate API calls, - // so we can also see "Queued, preparing - // runtime environment". - `((Queued|Locked), (Waiting .*|Container is allocated to an instance and preparing to run\.)\n)*`+ - `(Running, \n)?`+ - `Complete, \n`) + c.Check(allStatus, check.Matches, + `((Queued|Locked), waiting for dispatch\n)+`+ + // Occasionally the dispatcher will + // unlock/retry, and we get state/status from + // database/dispatcher via separate API calls, + // so we can also see "Queued, preparing + // to run". + `((Queued|Locked), (Waiting .*|Container is allocated to an instance and preparing to run\.)\n)*`+ + `(Running, \n)?`+ + `Complete, \n`) } logcfs = showlogs(cr.LogUUID) checkwebdavlogs(cr) -- 2.39.5