Replace CI test console logging with TestMain

davidbyttow · Dec 21, 2020 · 5af43e7 · 5af43e7
1 parent fd39df8
commit 5af43e7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 30 deletions.
diff --git a/vips/foreign_test.go b/vips/foreign_test.go
@@ -1,9 +1,10 @@
 package vips
 
 import (
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_DetermineImageType__JPEG(t *testing.T) {

diff --git a/vips/image_golden_test.go b/vips/image_golden_test.go
@@ -2,7 +2,6 @@ package vips
 
 import (
 	"io/ioutil"
-	"os"
 	"os/exec"
 	"runtime"
 	"strings"
@@ -12,12 +11,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func init() {
-	if os.Getenv("CI") != "" {
-		consoleLogging()
-	}
-}
-
 func TestImage_Resize_Downscale(t *testing.T) {
 	goldenTest(t, resources+"jpg-24bit.jpg",
 		func(img *ImageRef) error {

diff --git a/vips/image_test.go b/vips/image_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func init() {
-	if os.Getenv("CI") != "" {
-		consoleLogging()
-	}
+func TestMain(m *testing.M) {
+	ret := m.Run()
+	Shutdown()
+	os.Exit(ret)
 }
 
 func TestImageRef_WebP(t *testing.T) {

diff --git a/vips/logging_test.go b/vips/logging_test.go
@@ -20,9 +20,6 @@ func captureOutput(f func()) string {
 
 func Test_DefaultLogging(t *testing.T) {
 	Startup(nil)
-	if os.Getenv("CI") != "" {
-		enableLogging()
-	}
 	LoggingSettings(nil, LogLevelInfo)
 
 	output := captureOutput(func() {
@@ -31,16 +28,10 @@ func Test_DefaultLogging(t *testing.T) {
 	dateRegexp := regexp.MustCompile(`[0-9\/\:]+ `)
 	output = dateRegexp.ReplaceAllString(output, "")
 	assert.Equal(t, "[test.info] abcde12345\n", output)
-	if os.Getenv("CI") != "" {
-		consoleLogging()
-	}
 }
 
 func Test_LoggingVerbosity(t *testing.T) {
 	Startup(nil)
-	if os.Getenv("CI") != "" {
-		enableLogging()
-	}
 	LoggingSettings(nil, LogLevelMessage)
 
 	output := captureOutput(func() {
@@ -54,16 +45,10 @@ func Test_LoggingVerbosity(t *testing.T) {
 		govipsLog("test", LogLevelInfo, "fghji67890")
 	})
 	assert.Equal(t, "", output2)
-	if os.Getenv("CI") != "" {
-		consoleLogging()
-	}
 }
 
 func Test_LoggingHandler(t *testing.T) {
 	Startup(nil)
-	if os.Getenv("CI") != "" {
-		enableLogging()
-	}
 
 	var testDomain string
 	var testVerbosity LogLevel
@@ -79,7 +64,4 @@ func Test_LoggingHandler(t *testing.T) {
 	assert.Equal(t, "domain", testDomain)
 	assert.Equal(t, LogLevelCritical, testVerbosity)
 	assert.Equal(t, "abcde12345", testMessage)
-	if os.Getenv("CI") != "" {
-		consoleLogging()
-	}
 }