diff --git a/control/control_grpc_server_test.go b/control/control_grpc_server_test.go index 9840503ac..e4f3bf57c 100644 --- a/control/control_grpc_server_test.go +++ b/control/control_grpc_server_test.go @@ -75,7 +75,7 @@ func TestGRPCServerScheduler(t *testing.T) { log.Fatal(err) } c.Load(passthru) - filepub, err := core.NewRequestedPlugin(path.Join(fixtures.SnapPath, "plugin", "snap-publisher-file")) + filepub, err := core.NewRequestedPlugin(path.Join(fixtures.SnapPath, "plugin", "snap-publisher-mock-file")) if err != nil { log.Fatal(err) } diff --git a/control/control_test.go b/control/control_test.go index 75d63939d..d08c9a5f2 100644 --- a/control/control_test.go +++ b/control/control_test.go @@ -200,7 +200,7 @@ func TestSwapPlugin(t *testing.T) { }) }) - filePath := strings.Replace(fixtures.PluginPath, "snap-collector-mock2", "snap-publisher-file", 1) + filePath := strings.Replace(fixtures.PluginPath, "snap-collector-mock2", "snap-publisher-mock-file", 1) fileRP, pErr := core.NewRequestedPlugin(filePath) Convey("Loading a plugin should not error", t, func() { So(pErr, ShouldBeNil) @@ -1455,7 +1455,7 @@ func TestPublishMetrics(t *testing.T) { time.Sleep(1 * time.Second) // Load plugin - _, err := load(c, path.Join(fixtures.SnapPath, "plugin", "snap-publisher-file")) + _, err := load(c, path.Join(fixtures.SnapPath, "plugin", "snap-publisher-mock-file")) So(err, ShouldBeNil) <-lpe.done So(len(c.pluginManager.all()), ShouldEqual, 1) diff --git a/docs/SNAPCTL.md b/docs/SNAPCTL.md index 9221604fc..63da2d49d 100644 --- a/docs/SNAPCTL.md +++ b/docs/SNAPCTL.md @@ -119,7 +119,7 @@ $ $SNAP_PATH/bin/snapd -l 1 -t 0 $ $SNAP_PATH/bin/snapctl plugin load $SNAP_PATH/plugin/snap-collector-mock1 $ $SNAP_PATH/bin/snapctl plugin load $SNAP_PATH/plugin/snap-processor-passthru -$ $SNAP_PATH/bin/snapctl plugin load $SNAP_PATH/plugin/snap-publisher-file +$ $SNAP_PATH/bin/snapctl plugin load $SNAP_PATH/plugin/snap-publisher-mock-file $ $SNAP_PATH/bin/snapctl plugin list $ $SNAP_PATH/bin/snapctl task create -t $SNAP_PATH/../examples/tasks/mock-file.json $ $SNAP_PATH/bin/snapctl task create -w $SNAP_PATH/../mgmt/rest/wmap_sample/1.json -i 1s -d 10s diff --git a/mgmt/rest/client/client_func_test.go b/mgmt/rest/client/client_func_test.go index db29c9040..b25703662 100644 --- a/mgmt/rest/client/client_func_test.go +++ b/mgmt/rest/client/client_func_test.go @@ -48,7 +48,7 @@ var ( SNAP_PATH = os.Getenv("SNAP_PATH") MOCK_PLUGIN_PATH1 = []string{SNAP_PATH + "/plugin/snap-collector-mock1"} MOCK_PLUGIN_PATH2 = []string{SNAP_PATH + "/plugin/snap-collector-mock2"} - FILE_PLUGIN_PATH = []string{SNAP_PATH + "/plugin/snap-publisher-file"} + FILE_PLUGIN_PATH = []string{SNAP_PATH + "/plugin/snap-publisher-mock-file"} DIRECTORY_PATH = []string{SNAP_PATH + "/plugin/"} NextPort = 45000 diff --git a/mgmt/rest/rest_func_test.go b/mgmt/rest/rest_func_test.go index 0ade6c8c4..ed7878249 100644 --- a/mgmt/rest/rest_func_test.go +++ b/mgmt/rest/rest_func_test.go @@ -59,7 +59,7 @@ var ( SNAP_AUTODISCOVER_PATH = os.Getenv("SNAP_AUTODISCOVER_PATH") MOCK_PLUGIN_PATH1 = SNAP_PATH + "/plugin/snap-collector-mock1" MOCK_PLUGIN_PATH2 = SNAP_PATH + "/plugin/snap-collector-mock2" - FILE_PLUGIN_PATH = SNAP_PATH + "/plugin/snap-publisher-file" + FILE_PLUGIN_PATH = SNAP_PATH + "/plugin/snap-publisher-mock-file" CompressedUpload = true TotalUploadSize = 0 diff --git a/scheduler/distributed_task_test.go b/scheduler/distributed_task_test.go index a65c72ec0..0f8769fa6 100644 --- a/scheduler/distributed_task_test.go +++ b/scheduler/distributed_task_test.go @@ -64,7 +64,7 @@ func TestDistributedWorkflow(t *testing.T) { // Load appropriate plugins into each control. mock2Path := path.Join(PluginPath, "snap-collector-mock2") passthruPath := path.Join(PluginPath, "snap-processor-passthru") - filePath := path.Join(PluginPath, "snap-publisher-file") + filePath := path.Join(PluginPath, "snap-publisher-mock-file") // mock2 and file onto c1 @@ -153,7 +153,7 @@ func TestDistributedSubscriptions(t *testing.T) { // Load appropriate plugins into each control. mock2Path := path.Join(PluginPath, "snap-collector-mock2") passthruPath := path.Join(PluginPath, "snap-processor-passthru") - filePath := path.Join(PluginPath, "snap-publisher-file") + filePath := path.Join(PluginPath, "snap-publisher-mock-file") // mock2 and file onto c1 diff --git a/scheduler/workflow_test.go b/scheduler/workflow_test.go index 1334328b2..41b0a366a 100644 --- a/scheduler/workflow_test.go +++ b/scheduler/workflow_test.go @@ -51,7 +51,7 @@ var ( snap_collector_mock1_path = path.Join(SnapPath, "plugin", "snap-collector-mock1") snap_collector_mock2_path = path.Join(SnapPath, "plugin", "snap-collector-mock2") snap_processor_passthru_path = path.Join(SnapPath, "plugin", "snap-processor-passthru") - snap_publisher_file_path = path.Join(SnapPath, "plugin", "snap-publisher-file") + snap_publisher_file_path = path.Join(SnapPath, "plugin", "snap-publisher-mock-file") metricsToCollect = 3 )