Fix building tests that used `DefaultConfig()` but didn't pickup the package move.

This commit is contained in:
Sean Chittenden 2016-06-01 01:22:39 -07:00
parent b199743b8a
commit 837b387dcb
No known key found for this signature in database
GPG Key ID: 4EBC9DC16C2E5E16
3 changed files with 5 additions and 3 deletions

View File

@ -10,6 +10,7 @@ import (
"github.com/hashicorp/nomad/nomad/structs"
"github.com/hashicorp/nomad/testutil"
"github.com/hashicorp/nomad/client/config"
ctestutil "github.com/hashicorp/nomad/client/testutil"
)
@ -25,7 +26,7 @@ func (m *MockAllocStateUpdater) Update(alloc *structs.Allocation) {
func testAllocRunner(restarts bool) (*MockAllocStateUpdater, *AllocRunner) {
logger := testLogger()
conf := DefaultConfig()
conf := config.DefaultConfig()
conf.StateDir = os.TempDir()
conf.AllocDir = os.TempDir()
upd := &MockAllocStateUpdater{}

View File

@ -70,7 +70,7 @@ func testServer(t *testing.T, cb func(*nomad.Config)) (*nomad.Server, string) {
}
func testClient(t *testing.T, cb func(c *config.Config)) *Client {
conf := DefaultConfig()
conf := nomad.DefaultConfig()
conf.DevMode = true
conf.ConsulConfig = &sconfig.ConsulConfig{}
if cb != nil {

View File

@ -11,6 +11,7 @@ import (
"time"
"github.com/hashicorp/nomad/client/allocdir"
"github.com/hashicorp/nomad/client/config"
"github.com/hashicorp/nomad/client/driver"
cstructs "github.com/hashicorp/nomad/client/driver/structs"
"github.com/hashicorp/nomad/nomad/mock"
@ -46,7 +47,7 @@ func testTaskRunner(restarts bool) (*MockTaskStateUpdater, *TaskRunner) {
// the passed allocation.
func testTaskRunnerFromAlloc(restarts bool, alloc *structs.Allocation) (*MockTaskStateUpdater, *TaskRunner) {
logger := testLogger()
conf := DefaultConfig()
conf := config.DefaultConfig()
conf.StateDir = os.TempDir()
conf.AllocDir = os.TempDir()
upd := &MockTaskStateUpdater{}