From d2e48e35c031f6363aca2d9af0aa280d117a11d8 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Wed, 31 Oct 2018 21:36:15 -0700 Subject: [PATCH] tests: get consul integration tests building --- command/agent/consul/int_test.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/command/agent/consul/int_test.go b/command/agent/consul/int_test.go index 405a21854..65dab80fa 100644 --- a/command/agent/consul/int_test.go +++ b/command/agent/consul/int_test.go @@ -20,6 +20,8 @@ import ( "github.com/hashicorp/nomad/helper/testlog" "github.com/hashicorp/nomad/nomad/mock" "github.com/hashicorp/nomad/nomad/structs" + "github.com/hashicorp/nomad/plugins/shared/catalog" + "github.com/hashicorp/nomad/plugins/shared/singleton" "github.com/stretchr/testify/require" ) @@ -143,16 +145,18 @@ func TestConsul_Integration(t *testing.T) { }() // Build the config + pluginLoader := catalog.TestPluginLoader(t) config := &taskrunner.Config{ - Alloc: alloc, - ClientConfig: conf, - Consul: serviceClient, - Task: task, - TaskDir: taskDir, - Logger: logger, - VaultClient: vclient, - StateDB: state.NoopDB{}, - StateUpdater: logUpdate, + Alloc: alloc, + ClientConfig: conf, + Consul: serviceClient, + Task: task, + TaskDir: taskDir, + Logger: logger, + Vault: vclient, + StateDB: state.NoopDB{}, + StateUpdater: logUpdate, + PluginSingletonLoader: singleton.NewSingletonLoader(logger, pluginLoader), } tr, err := taskrunner.NewTaskRunner(config)