GH-55: use testutil.RunSuite instead of ginkgo.RunSpec

yandex · Jan 2, 2018 · 391e705 · 391e705
1 parent 37f3bb6
commit 391e705
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 53 deletions.
diff --git a/acceptance_tests/acceptance_suite_test.go b/acceptance_tests/acceptance_suite_test.go
@@ -16,18 +16,14 @@ import (
 	"github.com/onsi/gomega/gexec"
 	"go.uber.org/zap"
 
-	"github.com/onsi/gomega/format"
 	"github.com/yandex/pandora/lib/tag"
 	"github.com/yandex/pandora/lib/testutil"
 )
 
 var pandoraBin string
 
 func TestAcceptanceTests(t *testing.T) {
-	RegisterFailHandler(Fail)
-	format.UseStringerRepresentation = true
-
-	testutil.ReplaceGlobalLogger()
+	testutil.SetupSuite()
 	var args []string
 	if tag.Race {
 		zap.L().Debug("Building with race detector")

diff --git a/components/phttp/ammo/simple/jsonline/jsonline_suite_test.go b/components/phttp/ammo/simple/jsonline/jsonline_suite_test.go
@@ -19,11 +19,11 @@ import (
 	"github.com/spf13/afero"
 
 	"github.com/yandex/pandora/components/phttp/ammo/simple"
+	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestJsonline(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Jsonline Suite")
+	testutil.RunSuite(t, "Jsonline Suite")
 }
 
 const testFile = "./ammo.jsonline"

diff --git a/components/phttp/ammo/simple/raw/raw_suite_test.go b/components/phttp/ammo/simple/raw/raw_suite_test.go
@@ -3,11 +3,9 @@ package raw
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestRaw(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Raw Suite")
+	testutil.RunSuite(t, "Raw Suite")
 }
diff --git a/components/phttp/ammo/simple/uri/uri_suite_test.go b/components/phttp/ammo/simple/uri/uri_suite_test.go
@@ -3,11 +3,9 @@ package uri
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestUri(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Uri Suite")
+	testutil.RunSuite(t, "Uri Suite")
 }
diff --git a/components/phttp/phttp_suite_test.go b/components/phttp/phttp_suite_test.go
@@ -8,14 +8,9 @@ package phttp
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
 	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestPhttp(t *testing.T) {
-	RegisterFailHandler(Fail)
-	testutil.ReplaceGlobalLogger()
-	RunSpecs(t, "HTTP Suite")
+	testutil.RunSuite(t, "HTTP Suite")
 }
diff --git a/core/aggregate/netsample/netsample_suite_test.go b/core/aggregate/netsample/netsample_suite_test.go
@@ -3,14 +3,9 @@ package netsample
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
 	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestNetsample(t *testing.T) {
-	RegisterFailHandler(Fail)
-	testutil.ReplaceGlobalLogger()
-	RunSpecs(t, "Netsample Suite")
+	testutil.RunSuite(t, "Netsample Suite")
 }
diff --git a/core/aggregate/netsample/phout_test.go b/core/aggregate/netsample/phout_test.go
@@ -2,9 +2,7 @@ package netsample
 
 import (
 	"context"
-	"fmt"
 	"strings"
-	"testing"
 	"time"
 
 	. "github.com/onsi/ginkgo"
@@ -69,10 +67,6 @@ const (
 	testSampleNoIdPhout = "1484660999.002	tag1|tag2	333333	0	0	0	0	0	0	0	13	999"
 )
 
-func TestOUt(t *testing.T) {
-	fmt.Println(newTestSample().String())
-}
-
 func newTestSample() *Sample {
 	s := &Sample{}
 	s.timeStamp = time.Unix(1484660999, 002*1000000)

diff --git a/core/engine/engine_suite_test.go b/core/engine/engine_suite_test.go
@@ -1,17 +1,14 @@
 package engine
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
 	"testing"
 
 	"github.com/yandex/pandora/lib/monitoring"
+	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestEngine(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Engine Suite")
+	testutil.RunSuite(t, "Engine Suite")
 }
 
 func newTestMetrics() Metrics {

diff --git a/core/plugin/plugin_suite_test.go b/core/plugin/plugin_suite_test.go
@@ -8,14 +8,9 @@ package plugin
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
 	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestPlugin(t *testing.T) {
-	RegisterFailHandler(Fail)
-	testutil.ReplaceGlobalLogger()
-	RunSpecs(t, "Plugin Suite")
+	testutil.RunSuite(t, "Plugin Suite")
 }
diff --git a/core/provider/provider_suite_test.go b/core/provider/provider_suite_test.go
@@ -1,13 +1,11 @@
 package provider
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
 	"testing"
+
+	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestProvider(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Provider Suite")
+	testutil.RunSuite(t, "Provider Suite")
 }
diff --git a/core/schedule/schedule_suite_test.go b/core/schedule/schedule_suite_test.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/yandex/pandora/core"
 	"github.com/yandex/pandora/core/coretest"
+	"github.com/yandex/pandora/lib/testutil"
 )
 
 func TestSchedule(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Schedule Suite")
+	testutil.RunSuite(t, "Schedule Suite")
 }
 
 var _ = Describe("unlimited", func() {

diff --git a/lib/testutil/ginkgo.go b/lib/testutil/ginkgo.go
@@ -18,10 +18,14 @@ import (
 	"go.uber.org/zap/zapcore"
 )
 
-func RunSuite(t *testing.T, description string) {
-	format.UseStringerRepresentation = true
+func SetupSuite() {
+	format.UseStringerRepresentation = true // Otherwise error stacks have binary format.
 	ReplaceGlobalLogger()
 	RegisterFailHandler(Fail)
+}
+
+func RunSuite(t *testing.T, description string) {
+	SetupSuite()
 	RunSpecs(t, description)
 }