[ARVADOS] updated: 1.3.0-533-g96f739548

[Git user]

Summary of changes:
 lib/dispatchcloud/scheduler/run_queue_test.go | 2 +-
 lib/dispatchcloud/worker/worker_test.go       | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

       via  96f73954851d44ab715fa0b34861a93c00aa0519 (commit)
      from  c04d16f1482d10d64ddcceba4dcc7ab06032f033 (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 96f73954851d44ab715fa0b34861a93c00aa0519
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Mar 18 15:16:25 2019 -0400

    14807: Update tests to new worker/pool interface.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/dispatchcloud/scheduler/run_queue_test.go b/lib/dispatchcloud/scheduler/run_queue_test.go
index 9f26877f5..dab324579 100644
--- a/lib/dispatchcloud/scheduler/run_queue_test.go
+++ b/lib/dispatchcloud/scheduler/run_queue_test.go
@@ -77,7 +77,7 @@ func (p *stubPool) Create(it arvados.InstanceType) bool {
 	p.unalloc[it]++
 	return true
 }
-func (p *stubPool) KillContainer(uuid string) {
+func (p *stubPool) KillContainer(uuid, reason string) {
 	p.Lock()
 	defer p.Unlock()
 	delete(p.running, uuid)
diff --git a/lib/dispatchcloud/worker/worker_test.go b/lib/dispatchcloud/worker/worker_test.go
index 3bc33b62c..15a2a894c 100644
--- a/lib/dispatchcloud/worker/worker_test.go
+++ b/lib/dispatchcloud/worker/worker_test.go
@@ -209,12 +209,17 @@ func (suite *WorkerSuite) TestProbeAndUpdate(c *check.C) {
 			busy:     ctime,
 			probed:   ctime,
 			updated:  ctime,
+			running:  map[string]*remoteRunner{},
+			starting: map[string]*remoteRunner{},
+			probing:  make(chan struct{}, 1),
 		}
 		if trial.running > 0 {
-			wkr.running = map[string]struct{}{"zzzzz-dz642-abcdefghijklmno": struct{}{}}
+			uuid := "zzzzz-dz642-abcdefghijklmno"
+			wkr.running = map[string]*remoteRunner{uuid: newRemoteRunner(uuid, wkr)}
 		}
 		if trial.starting > 0 {
-			wkr.starting = map[string]struct{}{"zzzzz-dz642-abcdefghijklmno": struct{}{}}
+			uuid := "zzzzz-dz642-bcdefghijklmnop"
+			wkr.starting = map[string]*remoteRunner{uuid: newRemoteRunner(uuid, wkr)}
 		}
 		wkr.probeAndUpdate()
 		c.Check(wkr.state, check.Equals, trial.expectState)

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


hooks/post-receive
--