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

Commit

Permalink
Adds testing fixure to control for sharing mocks between different te…
Browse files Browse the repository at this point in the history 
…st types
  • Loading branch information
@jcooklin @IRCody
jcooklin authored and IRCody committed Jun 10, 2016
1 parent 8c5c543 commit 54fa222
Show file tree
Hide file tree
Showing 6 changed files with 243 additions and 210 deletions.
3 changes: 2 additions & 1 deletion control/available_plugin_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"net"
"testing"

"github.com/intelsdi-x/snap/control/fixtures"
"github.com/intelsdi-x/snap/control/plugin"
. "github.com/smartystreets/goconvey/convey"
)
Expand Down Expand Up @@ -56,7 +57,7 @@ func TestAvailablePlugin(t *testing.T) {
PluginLogPath: "/tmp/snap-test-plugin-stop.log",
}

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

Expand Down
45 changes: 17 additions & 28 deletions control/control_grpc_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
"golang.org/x/net/context"

log "github.com/Sirupsen/logrus"
"github.com/intelsdi-x/snap/control/fixtures"
"github.com/intelsdi-x/snap/control/plugin"
"github.com/intelsdi-x/snap/control/strategy"
"github.com/intelsdi-x/snap/core"
"github.com/intelsdi-x/snap/core/cdata"
"github.com/intelsdi-x/snap/core/ctypes"
"github.com/intelsdi-x/snap/grpc/common"
"github.com/intelsdi-x/snap/grpc/controlproxy"
Expand Down Expand Up @@ -63,17 +63,17 @@ func TestGRPCServerScheduler(t *testing.T) {
// collector -- mock
// processor -- passthru
// publisher -- file
mock, err := core.NewRequestedPlugin(JSONRPCPluginPath)
mock, err := core.NewRequestedPlugin(fixtures.JSONRPCPluginPath)
if err != nil {
log.Fatal(err)
}
c.Load(mock)
passthru, err := core.NewRequestedPlugin(path.Join(SnapPath, "plugin", "snap-processor-passthru"))
passthru, err := core.NewRequestedPlugin(path.Join(fixtures.SnapPath, "plugin", "snap-processor-passthru"))
if err != nil {
log.Fatal(err)
}
c.Load(passthru)
filepub, err := core.NewRequestedPlugin(path.Join(SnapPath, "plugin", "snap-publisher-file"))
filepub, err := core.NewRequestedPlugin(path.Join(fixtures.SnapPath, "plugin", "snap-publisher-file"))
if err != nil {
log.Fatal(err)
}
Expand Down Expand Up @@ -122,22 +122,11 @@ func TestGRPCServerScheduler(t *testing.T) {
})
})

validMetric := MockMetricType{
namespace: core.NewNamespace([]string{"intel", "mock", "foo"}...),
cfg: cdata.NewNode(),
ver: 0,
}
invalidMetric := MockMetricType{
namespace: core.NewNamespace([]string{"this", "is", "invalid"}...),
cfg: cdata.NewNode(),
ver: 1000,
}

// Verify that validate deps is properly passing through errors
Convey("Validating Deps", t, func() {
Convey("Should Fail if given invalid info", func() {
req := &rpc.ValidateDepsRequest{
Metrics: common.NewMetrics([]core.Metric{invalidMetric}),
Metrics: common.NewMetrics([]core.Metric{fixtures.InvalidMetric}),
Plugins: common.ToSubPluginsMsg([]core.SubscribedPlugin{}),
}
reply, err := client.ValidateDeps(context.Background(), req)
Expand All @@ -147,7 +136,7 @@ func TestGRPCServerScheduler(t *testing.T) {
})
Convey("with valid metrics", func() {
req := &rpc.ValidateDepsRequest{
Metrics: common.NewMetrics([]core.Metric{validMetric}),
Metrics: common.NewMetrics([]core.Metric{fixtures.ValidMetric}),
Plugins: common.ToSubPluginsMsg([]core.SubscribedPlugin{}),
}
reply, err := client.ValidateDeps(context.Background(), req)
Expand All @@ -160,7 +149,7 @@ func TestGRPCServerScheduler(t *testing.T) {
Convey("SubscribeDeps", t, func() {
Convey("Should Error with invalid inputs", func() {
req := &rpc.SubscribeDepsRequest{
Metrics: common.NewMetrics([]core.Metric{invalidMetric}),
Metrics: common.NewMetrics([]core.Metric{fixtures.InvalidMetric}),
Plugins: common.ToCorePluginsMsg([]core.Plugin{}),
TaskId: "my-snowflake-id",
}
Expand All @@ -172,7 +161,7 @@ func TestGRPCServerScheduler(t *testing.T) {
})
Convey("Should not error with valid inputs", func() {
req := &rpc.SubscribeDepsRequest{
Metrics: common.NewMetrics([]core.Metric{validMetric}),
Metrics: common.NewMetrics([]core.Metric{fixtures.ValidMetric}),
Plugins: common.ToCorePluginsMsg([]core.Plugin{}),
TaskId: "my-snowflake-id",
}
Expand All @@ -186,7 +175,7 @@ func TestGRPCServerScheduler(t *testing.T) {
Convey("UnsubscribeDeps", t, func() {
Convey("Should Error with invalid inputs", func() {
req := &rpc.SubscribeDepsRequest{
Metrics: common.NewMetrics([]core.Metric{invalidMetric}),
Metrics: common.NewMetrics([]core.Metric{fixtures.InvalidMetric}),
Plugins: common.ToCorePluginsMsg([]core.Plugin{}),
TaskId: "my-snowflake-id",
}
Expand All @@ -198,7 +187,7 @@ func TestGRPCServerScheduler(t *testing.T) {
})
Convey("Should not error with valid inputs", func() {
req := &rpc.SubscribeDepsRequest{
Metrics: common.NewMetrics([]core.Metric{validMetric}),
Metrics: common.NewMetrics([]core.Metric{fixtures.ValidMetric}),
Plugins: common.ToCorePluginsMsg([]core.Plugin{}),
TaskId: "my-snowflake-id",
}
Expand All @@ -212,7 +201,7 @@ func TestGRPCServerScheduler(t *testing.T) {
Convey("MatchingQueryToNamespaces", t, func() {
Convey("Should error with invalid inputs", func() {
req := &rpc.ExpandWildcardsRequest{
Namespace: common.ToNamespace(invalidMetric.Namespace()),
Namespace: common.ToNamespace(fixtures.InvalidMetric.Namespace()),
}
reply, err := client.MatchQueryToNamespaces(context.Background(), req)
// we don't expect rpc.errors
Expand All @@ -222,7 +211,7 @@ func TestGRPCServerScheduler(t *testing.T) {
})
Convey("Should not error with invalid inputs", func() {
req := &rpc.ExpandWildcardsRequest{
Namespace: common.ToNamespace(validMetric.Namespace()),
Namespace: common.ToNamespace(fixtures.ValidMetric.Namespace()),
}
reply, err := client.MatchQueryToNamespaces(context.Background(), req)
// we don't expect rpc.errors
Expand All @@ -234,7 +223,7 @@ func TestGRPCServerScheduler(t *testing.T) {
Convey("ExpandWildcards", t, func() {
Convey("Should error with invalid inputs", func() {
req := &rpc.ExpandWildcardsRequest{
Namespace: common.ToNamespace(invalidMetric.Namespace()),
Namespace: common.ToNamespace(fixtures.InvalidMetric.Namespace()),
}
reply, err := client.ExpandWildcards(context.Background(), req)
// we don't expect rpc errors
Expand All @@ -244,7 +233,7 @@ func TestGRPCServerScheduler(t *testing.T) {
})
Convey("Should not error with valid inputs", func() {
req := &rpc.ExpandWildcardsRequest{
Namespace: common.ToNamespace(validMetric.Namespace()),
Namespace: common.ToNamespace(fixtures.ValidMetric.Namespace()),
}
reply, err := client.ExpandWildcards(context.Background(), req)
// we don't expect rpc errors
Expand Down Expand Up @@ -278,7 +267,7 @@ func TestGRPCServerScheduler(t *testing.T) {
Convey("CollectMetrics", t, func() {
Convey("Should error with invalid inputs", func() {
req := &rpc.CollectMetricsRequest{
Metrics: common.NewMetrics([]core.Metric{invalidMetric}),
Metrics: common.NewMetrics([]core.Metric{fixtures.InvalidMetric}),
Deadline: &common.Time{
Sec: int64(time.Now().Unix()),
Nsec: int64(time.Now().Nanosecond()),
Expand All @@ -291,7 +280,7 @@ func TestGRPCServerScheduler(t *testing.T) {
})
Convey("should not error with valid inputs", func() {
req := &rpc.CollectMetricsRequest{
Metrics: common.NewMetrics([]core.Metric{validMetric}),
Metrics: common.NewMetrics([]core.Metric{fixtures.ValidMetric}),
Deadline: &common.Time{
Sec: int64(time.Now().Unix()),
Nsec: int64(time.Now().Nanosecond()),
Expand All @@ -301,7 +290,7 @@ func TestGRPCServerScheduler(t *testing.T) {
reply, err := client.CollectMetrics(context.Background(), req)
So(err, ShouldBeNil)
So(len(reply.Errors), ShouldEqual, 0)
So(reply.Metrics[0].Namespace, ShouldResemble, common.ToNamespace(validMetric.Namespace()))
So(reply.Metrics[0].Namespace, ShouldResemble, common.ToNamespace(fixtures.ValidMetric.Namespace()))
// Used in a later test as metrics to be passed to processor
mts = common.ToCoreMetrics(reply.Metrics)
})
Expand Down
Loading

0 comments on commit 54fa222

Please sign in to comment.