[ARVADOS] updated: 1.1.3-128-g2bb38ad

[Git user]

Summary of changes:
 services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go | 6 +++---
 services/crunch-dispatch-slurm/squeue_test.go                | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

       via  2bb38adc748cdd792fedb0d89ff70540703c2220 (commit)
       via  f05926dd62535d230a167d0fc5c9cc10e8289883 (commit)
      from  685befa1154009726ff84e6a5ab153080616d527 (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 2bb38adc748cdd792fedb0d89ff70540703c2220
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Mar 2 14:58:43 2018 -0500

    12552: Remove superfluous arithmetic.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index 371f7db..6852fc4 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -115,7 +115,7 @@ func (s *IntegrationSuite) integrationTest(c *C,
 
 	s.disp.Dispatcher = &dispatch.Dispatcher{
 		Arv:        arv,
-		PollPeriod: time.Duration(1) * time.Second,
+		PollPeriod: time.Second,
 		RunContainer: func(disp *dispatch.Dispatcher, ctr arvados.Container, status <-chan arvados.Container) {
 			go func() {
 				runContainer(disp, ctr)
@@ -260,10 +260,10 @@ func (s *StubbedSuite) testWithServerStub(c *C, apiStubResponses map[string]arva
 	ctx, cancel := context.WithCancel(context.Background())
 	dispatcher := dispatch.Dispatcher{
 		Arv:        arv,
-		PollPeriod: time.Duration(1) * time.Second,
+		PollPeriod: time.Second,
 		RunContainer: func(disp *dispatch.Dispatcher, ctr arvados.Container, status <-chan arvados.Container) {
 			go func() {
-				time.Sleep(1 * time.Second)
+				time.Sleep(time.Second)
 				disp.UpdateState(ctr.UUID, dispatch.Running)
 				disp.UpdateState(ctr.UUID, dispatch.Complete)
 			}()

commit f05926dd62535d230a167d0fc5c9cc10e8289883
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Mar 2 14:53:05 2018 -0500

    12552: Fix starvation in test case.
    
    refs #12552
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/crunch-dispatch-slurm/squeue_test.go b/services/crunch-dispatch-slurm/squeue_test.go
index f1ffda9..694a4d6 100644
--- a/services/crunch-dispatch-slurm/squeue_test.go
+++ b/services/crunch-dispatch-slurm/squeue_test.go
@@ -99,6 +99,14 @@ func (s *SqueueSuite) TestSetPriorityBeforeQueued(c *C) {
 		case <-tick.C:
 			slurm.queue = uuidGood + " 0 12345\n"
 			sqc.check()
+
+			// Avoid immediately selecting this case again
+			// on the next iteration if check() took
+			// longer than one tick.
+			select {
+			case <-tick.C:
+			default:
+			}
 		case <-timeout.C:
 			c.Fatal("timed out")
 		case <-done:

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


hooks/post-receive
--