From 4199ee78c8f966a31724783c070ad54e98b26aef Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Mon, 11 Jul 2016 10:34:24 -0700 Subject: [PATCH] Fixed distributed WF tests --- scheduler/distributed_task_test.go | 2 +- scheduler/scheduler_test.go | 4 ++-- scheduler/workflow_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scheduler/distributed_task_test.go b/scheduler/distributed_task_test.go index 0f8769fa6..6c30d686b 100644 --- a/scheduler/distributed_task_test.go +++ b/scheduler/distributed_task_test.go @@ -264,7 +264,7 @@ func dsWFMap(port int) *wmap.WorkflowMap { Target: fmt.Sprintf("127.0.0.1:%v", port), } pu := &wmap.PublishWorkflowMapNode{ - Name: "file", + Name: "mock-file", Version: -1, Config: make(map[string]interface{}), } diff --git a/scheduler/scheduler_test.go b/scheduler/scheduler_test.go index ae36a89d0..cb8901e83 100644 --- a/scheduler/scheduler_test.go +++ b/scheduler/scheduler_test.go @@ -181,7 +181,7 @@ func TestScheduler(t *testing.T) { c.setAcceptedContentType("machine", core.ProcessorPluginType, 1, []string{"snap.*", "snap.gob", "foo.bar"}) c.setReturnedContentType("machine", core.ProcessorPluginType, 1, []string{"snap.gob"}) c.setAcceptedContentType("rmq", core.PublisherPluginType, -1, []string{"snap.json", "snap.gob"}) - c.setAcceptedContentType("file", core.PublisherPluginType, -1, []string{"snap.json"}) + c.setAcceptedContentType("mock-file", core.PublisherPluginType, -1, []string{"snap.json"}) cfg := GetDefaultConfig() s := New(cfg) s.SetMetricManager(c) @@ -210,7 +210,7 @@ func TestScheduler(t *testing.T) { pu1.AddConfigItem("monies", 2) // Publish node direct to collection - pu2 := wmap.NewPublishNode("file", -1) + pu2 := wmap.NewPublishNode("mock-file", -1) pu2.AddConfigItem("color", "brown") pu2.AddConfigItem("purpose", 42) diff --git a/scheduler/workflow_test.go b/scheduler/workflow_test.go index 41b0a366a..64580243b 100644 --- a/scheduler/workflow_test.go +++ b/scheduler/workflow_test.go @@ -167,7 +167,7 @@ func TestCollectPublishWorkflow(t *testing.T) { w.CollectNode.AddMetric("/intel/mock/test", -1) w.CollectNode.AddConfigItem("/intel/mock/foo", "password", "secret") - pu := wmap.NewPublishNode("file", 3) + pu := wmap.NewPublishNode("mock-file", 3) pu.AddConfigItem("file", "/tmp/snap-TestCollectPublishWorkflow.out") pr := wmap.NewProcessNode("passthru", 1) @@ -228,7 +228,7 @@ func TestProcessChainingWorkflow(t *testing.T) { w.CollectNode.AddMetric("/intel/mock/foo", 2) w.CollectNode.AddConfigItem("/intel/mock/foo", "password", "secret") - pu := wmap.NewPublishNode("file", 3) + pu := wmap.NewPublishNode("mock-file", 3) pu.AddConfigItem("file", "/tmp/snap-TestCollectPublishWorkflow.out") pr1 := wmap.NewProcessNode("passthru", 1)