[ARVADOS] updated: 1.3.0-319-gfba0cd4c6
Git user
git at public.curoverse.com
Wed Feb 13 16:50:08 EST 2019
Summary of changes:
lib/dispatchcloud/dispatcher_test.go | 13 +++++++------
lib/dispatchcloud/test/stub_driver.go | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
via fba0cd4c6cd37f6034ddc862c945464c1aa58dd6 (commit)
from ff241c645b4f9c817739141016d6bb38ae46dc97 (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 fba0cd4c6cd37f6034ddc862c945464c1aa58dd6
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date: Wed Feb 13 16:50:03 2019 -0500
14745: Adds back param loading to StubDriver InstanceSet
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <eric.biagiotti at gmail.com>
diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index 674cacd56..00344e6cf 100644
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -43,12 +43,13 @@ func (s *DispatcherSuite) SetUpTest(c *check.C) {
s.cluster = &arvados.Cluster{
CloudVMs: arvados.CloudVMs{
- Driver: "test",
- SyncInterval: arvados.Duration(10 * time.Millisecond),
- TimeoutIdle: arvados.Duration(150 * time.Millisecond),
- TimeoutBooting: arvados.Duration(150 * time.Millisecond),
- TimeoutProbe: arvados.Duration(15 * time.Millisecond),
- TimeoutShutdown: arvados.Duration(5 * time.Millisecond),
+ Driver: "test",
+ SyncInterval: arvados.Duration(10 * time.Millisecond),
+ TimeoutIdle: arvados.Duration(150 * time.Millisecond),
+ TimeoutBooting: arvados.Duration(150 * time.Millisecond),
+ TimeoutProbe: arvados.Duration(15 * time.Millisecond),
+ TimeoutShutdown: arvados.Duration(5 * time.Millisecond),
+ DriverParameters: json.RawMessage(`{"test": true}`),
},
Dispatch: arvados.Dispatch{
PrivateKey: dispatchprivraw,
diff --git a/lib/dispatchcloud/test/stub_driver.go b/lib/dispatchcloud/test/stub_driver.go
index d90a20c39..0443f754d 100644
--- a/lib/dispatchcloud/test/stub_driver.go
+++ b/lib/dispatchcloud/test/stub_driver.go
@@ -64,7 +64,7 @@ func (sd *StubDriver) InstanceSet(params json.RawMessage, id cloud.InstanceSetID
servers: map[cloud.InstanceID]*StubVM{},
}
sd.instanceSets = append(sd.instanceSets, &sis)
- return &sis, nil
+ return &sis, json.Unmarshal(params, &sis)
}
// InstanceSets returns all instances that have been created by the
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list