From 5db45baa8f48f62b9875aee7d67adb4be08cdf56 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Sun, 25 Oct 2015 10:29:51 -0700 Subject: [PATCH] Rename scheduler -> mesosScheduler in plugin_test --- contrib/mesos/pkg/scheduler/plugin_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/mesos/pkg/scheduler/plugin_test.go b/contrib/mesos/pkg/scheduler/plugin_test.go index 731f65787b7..5c2772a6c13 100644 --- a/contrib/mesos/pkg/scheduler/plugin_test.go +++ b/contrib/mesos/pkg/scheduler/plugin_test.go @@ -473,7 +473,7 @@ func newLifecycleTest(t *testing.T) lifecycleTest { ), ) - scheduler := New(Config{ + mesosScheduler := New(Config{ Executor: ei, Client: client.NewOrDie(&client.Config{ Host: apiServer.server.URL, @@ -484,15 +484,15 @@ func newLifecycleTest(t *testing.T) lifecycleTest { LookupNode: apiServer.LookupNode, }) - assert.NotNil(scheduler.client, "client is nil") - assert.NotNil(scheduler.executor, "executor is nil") - assert.NotNil(scheduler.offers, "offer registry is nil") + assert.NotNil(mesosScheduler.client, "client is nil") + assert.NotNil(mesosScheduler.executor, "executor is nil") + assert.NotNil(mesosScheduler.offers, "offer registry is nil") // create scheduler process - schedulerProc := ha.New(scheduler) + schedulerProc := ha.New(mesosScheduler) // get plugin config from it - config := scheduler.NewPluginConfig( + config := mesosScheduler.NewPluginConfig( schedulerProc.Terminal(), http.DefaultServeMux, &podsListWatch.ListWatch, @@ -516,7 +516,7 @@ func newLifecycleTest(t *testing.T) lifecycleTest { eventObs: eventObs, plugin: plugin, podsListWatch: podsListWatch, - scheduler: scheduler, + scheduler: mesosScheduler, schedulerProc: schedulerProc, t: t, }