[ARVADOS] updated: 1.3.0-166-gf398e9d75

[Git user]

Summary of changes:
 lib/cloud/azure_test.go                                 | 8 +++++++-
 lib/dispatchcloud/test/stub_driver.go                   | 4 +++-
 services/crunch-dispatch-slurm/crunch-dispatch-slurm.go | 2 +-
 services/keep-web/main.go                               | 2 +-
 services/keepproxy/keepproxy.go                         | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

       via  f398e9d75d32fbfa6804041353997bf74195e489 (commit)
      from  443a0b96316ed46600dc5035193adae6ac4d1f74 (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 f398e9d75d32fbfa6804041353997bf74195e489
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Jan 11 14:04:06 2019 -0500

    14324: Fix tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/lib/cloud/azure_test.go b/lib/cloud/azure_test.go
index 24e0a70d7..7dbafe617 100644
--- a/lib/cloud/azure_test.go
+++ b/lib/cloud/azure_test.go
@@ -41,10 +41,12 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/config"
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-06-01/compute"
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-06-01/network"
+	"github.com/Azure/azure-sdk-for-go/storage"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/jmcvetta/randutil"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh"
 	check "gopkg.in/check.v1"
 )
@@ -112,7 +114,7 @@ func GetInstanceSet() (InstanceSet, ImageID, arvados.Cluster, error) {
 		if err != nil {
 			return nil, ImageID(""), cluster, err
 		}
-		ap, err := NewAzureInstanceSet(cfg, "test123")
+		ap, err := NewAzureInstanceSet(cfg, "test123", logrus.StandardLogger())
 		return ap, ImageID(cfg["image"].(string)), cluster, err
 	} else {
 		ap := AzureInstanceSet{
@@ -121,7 +123,11 @@ func GetInstanceSet() (InstanceSet, ImageID, arvados.Cluster, error) {
 			},
 			dispatcherID: "test123",
 			namePrefix:   "compute-test123-",
+			logger:       logrus.StandardLogger(),
+			deleteNIC:    make(chan string),
+			deleteBlob:   make(chan storage.Blob),
 		}
+		ap.ctx, ap.stopFunc = context.WithCancel(context.Background())
 		ap.vmClient = &VirtualMachinesClientStub{}
 		ap.netClient = &InterfacesClientStub{}
 		return &ap, ImageID("blob"), cluster, nil
diff --git a/lib/dispatchcloud/test/stub_driver.go b/lib/dispatchcloud/test/stub_driver.go
index 3c23457c9..f738e2066 100644
--- a/lib/dispatchcloud/test/stub_driver.go
+++ b/lib/dispatchcloud/test/stub_driver.go
@@ -45,7 +45,9 @@ type StubDriver struct {
 }
 
 // InstanceSet returns a new *StubInstanceSet.
-func (sd *StubDriver) InstanceSet(params map[string]interface{}, id cloud.InstanceSetID) (cloud.InstanceSet, error) {
+func (sd *StubDriver) InstanceSet(params map[string]interface{}, id cloud.InstanceSetID,
+	logger logrus.FieldLogger) (cloud.InstanceSet, error) {
+
 	sis := StubInstanceSet{
 		driver:  sd,
 		servers: map[cloud.InstanceID]*StubVM{},
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 31329c123..889e41095 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -23,8 +23,8 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"git.curoverse.com/arvados.git/sdk/go/config"
 	"git.curoverse.com/arvados.git/sdk/go/dispatch"
-	"github.com/sirupsen/logrus"
 	"github.com/coreos/go-systemd/daemon"
+	"github.com/sirupsen/logrus"
 )
 
 type logger interface {
diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index fd6353569..018b5a2e8 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -12,8 +12,8 @@ import (
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 	"git.curoverse.com/arvados.git/sdk/go/config"
-	log "github.com/sirupsen/logrus"
 	"github.com/coreos/go-systemd/daemon"
+	log "github.com/sirupsen/logrus"
 )
 
 var (
diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index def97e6e0..fc4783eff 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -26,10 +26,10 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/health"
 	"git.curoverse.com/arvados.git/sdk/go/httpserver"
 	"git.curoverse.com/arvados.git/sdk/go/keepclient"
-	log "github.com/sirupsen/logrus"
 	"github.com/coreos/go-systemd/daemon"
 	"github.com/ghodss/yaml"
 	"github.com/gorilla/mux"
+	log "github.com/sirupsen/logrus"
 )
 
 var version = "dev"

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


hooks/post-receive
--