status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8581 from hashicorp/dnephin/logging-tests 

logging: Remove t.Parallel from tests
This commit is contained in:
Daniel Nephin 2020-08-31 17:33:16 -04:00 committed by GitHub
parent 91d680b830 edddc95e0f
commit b6f902d516
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
logging/logfile_test.go
View File

@ -11,12 +11,11 @@ import (
const ( const (
testFileName = "Consul.log" testFileName = "Consul.log"
testDuration = 2 * time.Second testDuration = 50 * time.Millisecond
testBytes = 10 testBytes = 10
) )
func TestLogFile_timeRotation(t *testing.T) { func TestLogFile_timeRotation(t *testing.T) {
t.Parallel()
tempDir := testutil.TempDir(t, "LogWriterTime") tempDir := testutil.TempDir(t, "LogWriterTime")
logFile := LogFile{ logFile := LogFile{
fileName: testFileName, fileName: testFileName,
@ -24,7 +23,7 @@ func TestLogFile_timeRotation(t *testing.T) {
duration: testDuration, duration: testDuration,
} }
logFile.Write([]byte("Hello World")) logFile.Write([]byte("Hello World"))
time.Sleep(2 * time.Second) time.Sleep(3 * testDuration)
logFile.Write([]byte("Second File")) logFile.Write([]byte("Second File"))
want := 2 want := 2
if got, _ := ioutil.ReadDir(tempDir); len(got) != want { if got, _ := ioutil.ReadDir(tempDir); len(got) != want {
@ -33,7 +32,6 @@ func TestLogFile_timeRotation(t *testing.T) {
} }
func TestLogFile_openNew(t *testing.T) { func TestLogFile_openNew(t *testing.T) {
t.Parallel()
tempDir := testutil.TempDir(t, "LogWriterOpen") tempDir := testutil.TempDir(t, "LogWriterOpen")
logFile := LogFile{fileName: testFileName, logPath: tempDir, duration: testDuration} logFile := LogFile{fileName: testFileName, logPath: tempDir, duration: testDuration}
if err := logFile.openNew(); err != nil { if err := logFile.openNew(); err != nil {
@ -46,7 +44,6 @@ func TestLogFile_openNew(t *testing.T) {
} }
func TestLogFile_byteRotation(t *testing.T) { func TestLogFile_byteRotation(t *testing.T) {
t.Parallel()
tempDir := testutil.TempDir(t, "LogWriterBytes") tempDir := testutil.TempDir(t, "LogWriterBytes")
logFile := LogFile{ logFile := LogFile{
fileName: testFileName, fileName: testFileName,
@ -64,7 +61,6 @@ func TestLogFile_byteRotation(t *testing.T) {
} }
func TestLogFile_deleteArchives(t *testing.T) { func TestLogFile_deleteArchives(t *testing.T) {
t.Parallel()
tempDir := testutil.TempDir(t, "LogWriteDeleteArchives") tempDir := testutil.TempDir(t, "LogWriteDeleteArchives")
logFile := LogFile{ logFile := LogFile{
fileName: testFileName, fileName: testFileName,
@ -100,7 +96,6 @@ func TestLogFile_deleteArchives(t *testing.T) {
} }
func TestLogFile_deleteArchivesDisabled(t *testing.T) { func TestLogFile_deleteArchivesDisabled(t *testing.T) {
t.Parallel()
tempDir := testutil.TempDir(t, t.Name()) tempDir := testutil.TempDir(t, t.Name())
logFile := LogFile{ logFile := LogFile{
fileName: testFileName, fileName: testFileName,
@ -121,7 +116,6 @@ func TestLogFile_deleteArchivesDisabled(t *testing.T) {
} }
func TestLogFile_rotationDisabled(t *testing.T) { func TestLogFile_rotationDisabled(t *testing.T) {
t.Parallel()
tempDir := testutil.TempDir(t, t.Name()) tempDir := testutil.TempDir(t, t.Name())
logFile := LogFile{ logFile := LogFile{
fileName: testFileName, fileName: testFileName,

9
logging/logger_test.go
View File

@ -12,7 +12,6 @@ import (
) )
func TestLogger_SetupBasic(t *testing.T) { func TestLogger_SetupBasic(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
cfg := Config{LogLevel: "INFO"} cfg := Config{LogLevel: "INFO"}
@ -22,7 +21,6 @@ func TestLogger_SetupBasic(t *testing.T) {
} }
func TestLogger_SetupInvalidLogLevel(t *testing.T) { func TestLogger_SetupInvalidLogLevel(t *testing.T) {
t.Parallel()
cfg := Config{} cfg := Config{}
_, err := Setup(cfg, nil) _, err := Setup(cfg, nil)
@ -30,7 +28,6 @@ func TestLogger_SetupInvalidLogLevel(t *testing.T) {
} }
func TestLogger_SetupLoggerErrorLevel(t *testing.T) { func TestLogger_SetupLoggerErrorLevel(t *testing.T) {
t.Parallel()
cases := []struct { cases := []struct {
desc string desc string
@ -74,7 +71,6 @@ func TestLogger_SetupLoggerErrorLevel(t *testing.T) {
} }
func TestLogger_SetupLoggerDebugLevel(t *testing.T) { func TestLogger_SetupLoggerDebugLevel(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
cfg := Config{LogLevel: "DEBUG"} cfg := Config{LogLevel: "DEBUG"}
var buf bytes.Buffer var buf bytes.Buffer
@ -93,7 +89,6 @@ func TestLogger_SetupLoggerDebugLevel(t *testing.T) {
} }
func TestLogger_SetupLoggerWithName(t *testing.T) { func TestLogger_SetupLoggerWithName(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
cfg := Config{ cfg := Config{
LogLevel: "DEBUG", LogLevel: "DEBUG",
@ -111,7 +106,6 @@ func TestLogger_SetupLoggerWithName(t *testing.T) {
} }
func TestLogger_SetupLoggerWithJSON(t *testing.T) { func TestLogger_SetupLoggerWithJSON(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
cfg := Config{ cfg := Config{
LogLevel: "DEBUG", LogLevel: "DEBUG",
@ -136,7 +130,6 @@ func TestLogger_SetupLoggerWithJSON(t *testing.T) {
} }
func TestLogger_SetupLoggerWithValidLogPath(t *testing.T) { func TestLogger_SetupLoggerWithValidLogPath(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
tmpDir := testutil.TempDir(t, t.Name()) tmpDir := testutil.TempDir(t, t.Name())
@ -153,7 +146,6 @@ func TestLogger_SetupLoggerWithValidLogPath(t *testing.T) {
} }
func TestLogger_SetupLoggerWithInValidLogPath(t *testing.T) { func TestLogger_SetupLoggerWithInValidLogPath(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
cfg := Config{ cfg := Config{
@ -169,7 +161,6 @@ func TestLogger_SetupLoggerWithInValidLogPath(t *testing.T) {
} }
func TestLogger_SetupLoggerWithInValidLogPathPermission(t *testing.T) { func TestLogger_SetupLoggerWithInValidLogPathPermission(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
tmpDir := "/tmp/" + t.Name() tmpDir := "/tmp/" + t.Name()

5
logging/monitor/monitor_test.go
View File

@ -10,7 +10,6 @@ import (
) )
func TestMonitor_Start(t *testing.T) { func TestMonitor_Start(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
logger := log.NewInterceptLogger(&log.LoggerOptions{ logger := log.NewInterceptLogger(&log.LoggerOptions{
@ -41,7 +40,6 @@ func TestMonitor_Start(t *testing.T) {
} }
func TestMonitor_Stop(t *testing.T) { func TestMonitor_Stop(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
logger := log.NewInterceptLogger(&log.LoggerOptions{ logger := log.NewInterceptLogger(&log.LoggerOptions{
@ -82,7 +80,6 @@ func TestMonitor_Stop(t *testing.T) {
} }
func TestMonitor_DroppedMessages(t *testing.T) { func TestMonitor_DroppedMessages(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
logger := log.NewInterceptLogger(&log.LoggerOptions{ logger := log.NewInterceptLogger(&log.LoggerOptions{
@ -125,7 +122,6 @@ func TestMonitor_DroppedMessages(t *testing.T) {
} }
func TestMonitor_ZeroBufSizeDefault(t *testing.T) { func TestMonitor_ZeroBufSizeDefault(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
logger := log.NewInterceptLogger(&log.LoggerOptions{ logger := log.NewInterceptLogger(&log.LoggerOptions{
@ -162,7 +158,6 @@ func TestMonitor_ZeroBufSizeDefault(t *testing.T) {
} }
func TestMonitor_WriteStopped(t *testing.T) { func TestMonitor_WriteStopped(t *testing.T) {
t.Parallel()
require := require.New(t) require := require.New(t)
logger := log.NewInterceptLogger(&log.LoggerOptions{ logger := log.NewInterceptLogger(&log.LoggerOptions{