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

Commit

Permalink
Renamed variables in fixtures.go and tests files
Browse files Browse the repository at this point in the history
  • Loading branch information
@IzabellaRaulin
IzabellaRaulin committed Nov 2, 2016
1 parent 908767e commit 4b8f7af
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 53 deletions.
2 changes: 1 addition & 1 deletion control/available_plugin_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestAvailablePlugin(t *testing.T) {
r.SetEmitter(new(MockEmitter))
a := plugin.Arg{}

exPlugin, _ := plugin.NewExecutablePlugin(a, fixtures.PluginPath)
exPlugin, _ := plugin.NewExecutablePlugin(a, fixtures.PluginPathMock2)
ap, err := r.startPlugin(exPlugin)
So(err, ShouldBeNil)

Expand Down
2 changes: 1 addition & 1 deletion control/control_grpc_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func TestGRPCServerScheduler(t *testing.T) {
// collector -- mock
// processor -- passthru
// publisher -- file
mock, err := core.NewRequestedPlugin(fixtures.JSONRPCPluginPath)
mock, err := core.NewRequestedPlugin(fixtures.PluginPathMock1)
if err != nil {
log.Fatal(err)
}
Expand Down
56 changes: 28 additions & 28 deletions control/control_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func TestSwapPlugin(t *testing.T) {
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginsSwapped", lpe)

_, e := load(c, fixtures.PluginPath)
_, e := load(c, fixtures.PluginPathMock2)
Convey("Loading first plugin", t, func() {
Convey("Should not error", func() {
So(e, ShouldBeNil)
Expand All @@ -177,8 +177,7 @@ func TestSwapPlugin(t *testing.T) {
So(c.PluginCatalog()[0].Name(), ShouldEqual, "mock")
})
})
mock1Path := strings.Replace(fixtures.PluginPath, "snap-plugin-collector-mock2", "snap-plugin-collector-mock1", 1)
mockRP, mErr := core.NewRequestedPlugin(mock1Path)
mockRP, mErr := core.NewRequestedPlugin(fixtures.PluginPathMock1)
Convey("Loading a plugin should not error", t, func() {
So(mErr, ShouldBeNil)
})
Expand Down Expand Up @@ -224,7 +223,7 @@ func TestSwapPlugin(t *testing.T) {
})
})

filePath := strings.Replace(fixtures.PluginPath, "snap-plugin-collector-mock2", "snap-plugin-publisher-mock-file", 1)
filePath := strings.Replace(fixtures.PluginPathMock2, "snap-plugin-collector-mock2", "snap-plugin-publisher-mock-file", 1)
fileRP, pErr := core.NewRequestedPlugin(filePath)
Convey("Loading a plugin should not error", t, func() {
So(pErr, ShouldBeNil)
Expand All @@ -248,7 +247,7 @@ func TestSwapPlugin(t *testing.T) {
pm.ExistingPlugin = lp
c.pluginManager = pm

mockRP, mErr := core.NewRequestedPlugin(mock1Path)
mockRP, mErr := core.NewRequestedPlugin(fixtures.PluginPathMock1)
So(mErr, ShouldBeNil)
err := c.SwapPlugins(mockRP, lp)
Convey("So err should be received if rollback fails", func() {
Expand Down Expand Up @@ -357,7 +356,7 @@ func TestLoad(t *testing.T) {

// Testing trying to load before starting pluginControl
Convey("pluginControl before being started", t, func() {
_, err := load(c, fixtures.PluginPath)
_, err := load(c, fixtures.PluginPathMock2)
Convey("should return an error when loading a plugin", func() {
So(err, ShouldNotBeNil)
})
Expand All @@ -371,7 +370,7 @@ func TestLoad(t *testing.T) {
time.Sleep(100 * time.Millisecond)
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
_, err := load(c, fixtures.PluginPath)
_, err := load(c, fixtures.PluginPathMock2)
Convey("pluginControl.Load on successful load", t, func() {
Convey("Should not return an error", func() {
So(err, ShouldBeNil)
Expand Down Expand Up @@ -400,7 +399,7 @@ func TestLoad(t *testing.T) {
c.Stop()
time.Sleep(100 * time.Millisecond)
} else {
fmt.Printf("SNAP_PATH not set. Cannot test %s plugin.\n", fixtures.PluginName)
fmt.Printf("SNAP_PATH not set. Cannot test %s plugin.\n", fixtures.PluginNameMock2)
}
}

Expand All @@ -414,7 +413,7 @@ func TestLoadWithSignedPlugins(t *testing.T) {
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
c.Start()
time.Sleep(100 * time.Millisecond)
_, err := load(c, fixtures.PluginPath, "mock.asc")
_, err := load(c, fixtures.PluginPathMock2, "mock.asc")
Convey("so error on loading a signed plugin should be nil", func() {
So(err, ShouldBeNil)
})
Expand All @@ -430,7 +429,7 @@ func TestLoadWithSignedPlugins(t *testing.T) {
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
c.Start()
time.Sleep(100 * time.Millisecond)
_, err := load(c, fixtures.PluginPath)
_, err := load(c, fixtures.PluginPathMock2)
Convey("so error on loading an unsigned plugin should be nil", func() {
So(err, ShouldBeNil)
})
Expand All @@ -443,14 +442,14 @@ func TestLoadWithSignedPlugins(t *testing.T) {
c.signingManager = &mocksigningManager{signed: false}
c.Start()
time.Sleep(100 * time.Millisecond)
_, err := load(c, fixtures.PluginPath)
_, err := load(c, fixtures.PluginPathMock2)
Convey("so error should not be nil when loading an unsigned plugin with trust enabled", func() {
So(err, ShouldNotBeNil)
})
c.Stop()
})
} else {
fmt.Printf("SNAP_PATH not set. Cannot test %s plugin.\n", fixtures.PluginName)
fmt.Printf("SNAP_PATH not set. Cannot test %s plugin.\n", fixtures.PluginNameMock2)
}
}

Expand All @@ -464,7 +463,7 @@ func TestUnload(t *testing.T) {
c.eventManager.RegisterHandler("TestUnload", lpe)
c.Start()
time.Sleep(100 * time.Millisecond)
_, e := load(c, fixtures.PluginPath)
_, e := load(c, fixtures.PluginPathMock2)
Convey("Loading a plugin to test unload", t, func() {
Convey("Should not error", func() {
So(e, ShouldBeNil)
Expand Down Expand Up @@ -516,7 +515,7 @@ func TestUnload(t *testing.T) {
c.Stop()
time.Sleep(100 * time.Millisecond)
} else {
fmt.Printf("SNAP_PATH not set. Cannot test %s plugin.\n", fixtures.PluginName)
fmt.Printf("SNAP_PATH not set. Cannot test %s plugin.\n", fixtures.PluginNameMock2)
}
}

Expand Down Expand Up @@ -770,7 +769,7 @@ func TestMetricConfig(t *testing.T) {
c.Start()
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
_, err := load(c, fixtures.JSONRPCPluginPath)
_, err := load(c, fixtures.PluginPathMock1)
So(err, ShouldBeNil)
<-lpe.done

Expand Down Expand Up @@ -805,7 +804,7 @@ func TestMetricConfig(t *testing.T) {
c.Start()
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
_, err := load(c, fixtures.JSONRPCPluginPath)
_, err := load(c, fixtures.PluginPathMock1)
So(err, ShouldBeNil)
<-lpe.done
m1 := fixtures.MockMetricType{
Expand All @@ -829,7 +828,7 @@ func TestMetricConfig(t *testing.T) {
c.Start()
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
_, err := load(c, fixtures.JSONRPCPluginPath)
_, err := load(c, fixtures.PluginPathMock1)
So(err, ShouldBeNil)
<-lpe.done

Expand All @@ -854,7 +853,7 @@ func TestMetricConfig(t *testing.T) {
c.Start()
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
_, err := load(c, fixtures.JSONRPCPluginPath)
_, err := load(c, fixtures.PluginPathMock1)
So(err, ShouldBeNil)
<-lpe.done
m1 := fixtures.MockMetricType{
Expand All @@ -878,7 +877,7 @@ func TestRoutingCachingStrategy(t *testing.T) {
c.Start()
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
_, e := load(c, fixtures.PluginPath)
_, e := load(c, fixtures.PluginPathMock2)
So(e, ShouldBeNil)
if e != nil {
t.FailNow()
Expand Down Expand Up @@ -948,7 +947,7 @@ func TestRoutingCachingStrategy(t *testing.T) {
)
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
_, e := load(c, fixtures.JSONRPCPluginPath)
_, e := load(c, fixtures.PluginPathMock1)
So(e, ShouldBeNil)
if e != nil {
t.FailNow()
Expand Down Expand Up @@ -1028,8 +1027,8 @@ func TestCollectDynamicMetrics(t *testing.T) {
So(strategy.GlobalCacheExpiration, ShouldResemble, time.Second*1)
lpe := newListenToPluginEvent()
c.eventManager.RegisterHandler("Control.PluginLoaded", lpe)
_, e := load(c, fixtures.PluginPath)
Convey("Loading native client plugin", func() {
_, e := load(c, fixtures.PluginPathMock2)
Convey("Loading the first native client plugin", func() {
Convey("Should not error", func() {
So(e, ShouldBeNil)
})
Expand All @@ -1038,8 +1037,9 @@ func TestCollectDynamicMetrics(t *testing.T) {
t.FailNow()
}
<-lpe.done
_, e = load(c, fixtures.JSONRPCPluginPath)
Convey("Loading JSONRPC client plugin", func() {

_, e = load(c, fixtures.PluginPathMock1)
Convey("Loading the second native client plugin", func() {
Convey("Should not error", func() {
So(e, ShouldBeNil)
})
Expand Down Expand Up @@ -1126,7 +1126,7 @@ func TestFailedPlugin(t *testing.T) {
c.Config.Plugins.All.AddItem("password", ctypes.ConfigValueStr{Value: "testval"})

// Load plugin
_, e := load(c, fixtures.PluginPath)
_, e := load(c, fixtures.PluginPathMock2)
So(e, ShouldBeNil)
<-lpe.done
_, err := c.MetricCatalog()
Expand Down Expand Up @@ -1210,7 +1210,7 @@ func TestCollectMetrics(t *testing.T) {
c.Config.Plugins.Collector.Plugins["mock"] = newPluginConfigItem(optAddPluginConfigItem("test", ctypes.ConfigValueBool{Value: true}))

// Load plugin
_, e := load(c, fixtures.JSONRPCPluginPath)
_, e := load(c, fixtures.PluginPathMock1)
So(e, ShouldBeNil)
<-lpe.done
mts, err := c.MetricCatalog()
Expand Down Expand Up @@ -1304,7 +1304,7 @@ func TestCollectNonSpecifiedDynamicMetrics(t *testing.T) {
c.Config.Plugins.Collector.Plugins["mock"] = newPluginConfigItem(optAddPluginConfigItem("test", ctypes.ConfigValueBool{Value: true}))

// Load plugin
_, e := load(c, fixtures.JSONRPCPluginPath)
_, e := load(c, fixtures.PluginPathMock1)
So(e, ShouldBeNil)
<-lpe.done
mts, err := c.MetricCatalog()
Expand Down Expand Up @@ -1387,7 +1387,7 @@ func TestCollectSpecifiedDynamicMetrics(t *testing.T) {
c.Start()

// Load plugin
_, e := load(c, fixtures.JSONRPCPluginPath)
_, e := load(c, fixtures.PluginPathMock1)
So(e, ShouldBeNil)

mts, err := c.MetricCatalog()
Expand Down
11 changes: 6 additions & 5 deletions control/fixtures/fixtures.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ import (
)

var (
PluginName = "snap-plugin-collector-mock2"
SnapPath = helper.BuildPath
PluginPath = helper.PluginFilePath(PluginName)
SnapPath = helper.BuildPath

JSONRPCPluginName = "snap-plugin-collector-mock1"
JSONRPCPluginPath = helper.PluginFilePath(JSONRPCPluginName)
PluginNameMock1 = "snap-plugin-collector-mock1"
PluginPathMock1 = helper.PluginFilePath(PluginNameMock1)

PluginNameMock2 = "snap-plugin-collector-mock2"
PluginPathMock2 = helper.PluginFilePath(PluginNameMock2)
)

// mocks a metric type
Expand Down
18 changes: 9 additions & 9 deletions control/plugin_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func TestLoadPlugin(t *testing.T) {
Convey("loads plugin successfully", func() {
p := newPluginManager()
p.SetMetricCatalog(newMetricCatalog())
lp, err := loadPlugin(p, fixtures.PluginPath)
lp, err := loadPlugin(p, fixtures.PluginPathMock2)

So(lp, ShouldHaveSameTypeAs, new(loadedPlugin))
So(p.all(), ShouldNotBeEmpty)
Expand All @@ -115,7 +115,7 @@ func TestLoadPlugin(t *testing.T) {
cfg.Plugins.Collector.Plugins["mock"] = newPluginConfigItem(optAddPluginConfigItem("test", ctypes.ConfigValueBool{Value: true}))
p := newPluginManager(OptSetPluginConfig(cfg.Plugins))
p.SetMetricCatalog(newMetricCatalog())
lp, serr := loadPlugin(p, fixtures.PluginPath)
lp, serr := loadPlugin(p, fixtures.PluginPathMock2)

So(lp, ShouldHaveSameTypeAs, new(loadedPlugin))
So(p.all(), ShouldNotBeEmpty)
Expand All @@ -135,7 +135,7 @@ func TestLoadPlugin(t *testing.T) {
cfg.Plugins.Collector.Plugins["mock"] = newPluginConfigItem(optAddPluginConfigItem("test-fail", ctypes.ConfigValueBool{Value: true}))
p := newPluginManager(OptSetPluginConfig(cfg.Plugins))
p.SetMetricCatalog(newMetricCatalog())
lp, err := loadPlugin(p, fixtures.PluginPath)
lp, err := loadPlugin(p, fixtures.PluginPathMock2)

So(lp, ShouldBeNil)
So(p.all(), ShouldBeEmpty)
Expand All @@ -144,10 +144,10 @@ func TestLoadPlugin(t *testing.T) {
So(len(p.all()), ShouldEqual, 0)
})

Convey("loads json-rpc plugin successfully", func() {
Convey("loads native-rpc plugin successfully", func() {
p := newPluginManager()
p.SetMetricCatalog(newMetricCatalog())
lp, err := loadPlugin(p, fixtures.JSONRPCPluginPath)
lp, err := loadPlugin(p, fixtures.PluginPathMock1)

So(lp, ShouldHaveSameTypeAs, new(loadedPlugin))
So(p.loadedPlugins, ShouldNotBeEmpty)
Expand All @@ -158,7 +158,7 @@ func TestLoadPlugin(t *testing.T) {
Convey("loads plugin with cache TTL set", func() {
p := newPluginManager()
p.SetMetricCatalog(newMetricCatalog())
lp, err := loadPlugin(p, fixtures.JSONRPCPluginPath)
lp, err := loadPlugin(p, fixtures.PluginPathMock1)

So(err, ShouldBeNil)
So(lp.Meta.CacheTTL, ShouldNotBeNil)
Expand All @@ -178,7 +178,7 @@ func TestUnloadPlugin(t *testing.T) {
Convey("then it is removed from the loadedPlugins", func() {
p := newPluginManager()
p.SetMetricCatalog(newMetricCatalog())
_, err := loadPlugin(p, fixtures.PluginPath)
_, err := loadPlugin(p, fixtures.PluginPathMock2)
So(err, ShouldBeNil)

numPluginsLoaded := len(p.all())
Expand All @@ -195,7 +195,7 @@ func TestUnloadPlugin(t *testing.T) {
Convey("then an error is thrown", func() {
p := newPluginManager()
p.SetMetricCatalog(newMetricCatalog())
lp, err := loadPlugin(p, fixtures.PluginPath)
lp, err := loadPlugin(p, fixtures.PluginPathMock2)
glp, err2 := p.get("collector" + core.Separator + "mock" + core.Separator + "2")
So(err2, ShouldBeNil)
glp.State = DetectedState
Expand All @@ -208,7 +208,7 @@ func TestUnloadPlugin(t *testing.T) {
Convey("then an error is thrown", func() {
p := newPluginManager()
p.SetMetricCatalog(newMetricCatalog())
_, err := loadPlugin(p, fixtures.PluginPath)
_, err := loadPlugin(p, fixtures.PluginPathMock2)

lp, err2 := p.get("collector" + core.Separator + "mock" + core.Separator + "2")
So(err2, ShouldBeNil)
Expand Down

0 comments on commit 4b8f7af

Please sign in to comment.