From 640fb3e213a75a60109c78b38ddac7f3fe6156a1 Mon Sep 17 00:00:00 2001 From: Michael Desa Date: Tue, 31 Jul 2018 13:48:58 -0400 Subject: [PATCH] chore(testing): update test package to use correct source type --- Gopkg.lock | 68 +++++++++++++++++++++++++++++++++++++++++++++++ testing/source.go | 12 +++++---- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 6ef0f22dfc..a8c51ac18b 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -208,7 +208,12 @@ version = "v1.38.1" [[projects]] +<<<<<<< HEAD digest = "1:8cab0d635f075344e3c0ee979c1995bb6880fba073a583bc52ab01df416e0a6b" +||||||| parent of 013a56c9b... chore(testing): update test package to use correct source type +======= + digest = "1:32e6bf93f32b6562d44dcdae34fd11a819224db80627bbc4ee108bfc01f81922" +>>>>>>> 013a56c9b... chore(testing): update test package to use correct source type name = "github.com/gogo/protobuf" packages = [ "gogoproto", @@ -1043,6 +1048,7 @@ version = "v1.13.0" [[projects]] +<<<<<<< HEAD branch = "v2" digest = "1:e8c48aa61ea272e211858e52979ad4d114c60bfe6900d12431ac697482100b0a" name = "gopkg.in/robfig/cron.v2" @@ -1053,6 +1059,11 @@ [[projects]] branch = "v2" digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" +||||||| parent of 013a56c9b... chore(testing): update test package to use correct source type +======= + branch = "v2" + digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" +>>>>>>> 013a56c9b... chore(testing): update test package to use correct source type name = "gopkg.in/yaml.v2" packages = ["."] pruneopts = "UT" @@ -1061,6 +1072,7 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 +<<<<<<< HEAD input-imports = [ "github.com/NYTimes/gziphandler", "github.com/andreyvit/diff", @@ -1115,5 +1127,61 @@ "google.golang.org/grpc", "gopkg.in/robfig/cron.v2", ] +||||||| parent of 013a56c9b... chore(testing): update test package to use correct source type + inputs-digest = "98278f4964b8c10b5c7667b2d695a8249efda38bdf7e11d756afeb0c76fa7005" +======= + input-imports = [ + "github.com/NYTimes/gziphandler", + "github.com/andreyvit/diff", + "github.com/bouk/httprouter", + "github.com/c-bata/go-prompt", + "github.com/cespare/xxhash", + "github.com/coreos/bbolt", + "github.com/dgrijalva/jwt-go", + "github.com/elazarl/go-bindata-assetfs", + "github.com/gogo/protobuf/gogoproto", + "github.com/gogo/protobuf/proto", + "github.com/gogo/protobuf/types", + "github.com/gonum/stat/distuv", + "github.com/google/go-cmp/cmp", + "github.com/google/go-cmp/cmp/cmpopts", + "github.com/google/go-github/github", + "github.com/goreleaser/goreleaser", + "github.com/influxdata/influxdb/logger", + "github.com/influxdata/influxdb/pkg/snowflake", + "github.com/influxdata/influxql", + "github.com/influxdata/line-protocol", + "github.com/influxdata/tdigest", + "github.com/influxdata/usage-client/v1", + "github.com/jessevdk/go-flags", + "github.com/julienschmidt/httprouter", + "github.com/kevinburke/go-bindata", + "github.com/mna/pigeon", + "github.com/opentracing/opentracing-go", + "github.com/pkg/errors", + "github.com/prometheus/client_golang/prometheus", + "github.com/prometheus/client_golang/prometheus/promhttp", + "github.com/prometheus/client_model/go", + "github.com/prometheus/common/expfmt", + "github.com/satori/go.uuid", + "github.com/segmentio/kafka-go", + "github.com/sirupsen/logrus", + "github.com/spf13/cobra", + "github.com/spf13/viper", + "github.com/tylerb/graceful", + "github.com/uber/jaeger-client-go/config", + "github.com/uber/jaeger-client-go/log", + "github.com/uber/jaeger-lib/metrics", + "go.uber.org/zap", + "go.uber.org/zap/zaptest/observer", + "golang.org/x/net/context", + "golang.org/x/oauth2", + "golang.org/x/oauth2/github", + "golang.org/x/oauth2/heroku", + "golang.org/x/text/unicode/norm", + "google.golang.org/api/oauth2/v2", + "google.golang.org/grpc", + ] +>>>>>>> 013a56c9b... chore(testing): update test package to use correct source type solver-name = "gps-cdcl" solver-version = 1 diff --git a/testing/source.go b/testing/source.go index 22703140c8..69e64fbf9a 100644 --- a/testing/source.go +++ b/testing/source.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" "github.com/influxdata/platform" "github.com/influxdata/platform/mock" ) @@ -23,6 +24,7 @@ var sourceCmpOptions = cmp.Options{ cmp.Comparer(func(x, y []byte) bool { return bytes.Equal(x, y) }), + cmpopts.IgnoreFields(platform.Source{}, "BucketService"), cmp.Transformer("Sort", func(in []*platform.Source) []*platform.Source { out := append([]*platform.Source(nil), in...) // Copy input to avoid mutating it sort.Slice(out, func(i, j int) bool { @@ -72,7 +74,7 @@ func CreateSource( sources: []*platform.Source{ { Name: "autogen", - Type: "v2", + Type: "self", ID: idFromString(t, defaultSourceID), Default: true, }, @@ -165,7 +167,7 @@ func FindSourceByID( wants: wants{ source: &platform.Source{ Name: "autogen", - Type: "v2", + Type: "self", ID: idFromString(t, defaultSourceID), Default: true, }, @@ -235,7 +237,7 @@ func FindSources( sources: []*platform.Source{ { Name: "autogen", - Type: "v2", + Type: "self", ID: idFromString(t, defaultSourceID), Default: true, }, @@ -312,7 +314,7 @@ func DeleteSource( sources: []*platform.Source{ { Name: "autogen", - Type: "v2", + Type: "self", ID: idFromString(t, defaultSourceID), Default: true, }, @@ -333,7 +335,7 @@ func DeleteSource( sources: []*platform.Source{ { Name: "autogen", - Type: "v2", + Type: "self", ID: idFromString(t, defaultSourceID), Default: true, },