Skip to content
This repository has been archived by the owner on Nov 8, 2022. It is now read-only.

Commit

Permalink
Fixed plugin name in various tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Taylor Thomas committed Jul 8, 2016
1 parent a5a7b61 commit a1b5fe6
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion control/control_grpc_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions control/control_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/SNAPCTL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mgmt/rest/client/client_func_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mgmt/rest/rest_func_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scheduler/distributed_task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scheduler/workflow_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down

0 comments on commit a1b5fe6

Please sign in to comment.