fix broken tests

Makefile

@@ -3,7 +3,7 @@ PACKAGE := github.com/derailed/$(NAME)
 GIT     := $(shell git rev-parse --short HEAD)
 SOURCE_DATE_EPOCH ?= $(shell date +%s)
 DATE    := $(shell date -u -d @${SOURCE_DATE_EPOCH} +%FT%T%Z)
-VERSION  ?= v0.21.8
+VERSION  ?= v0.21.10
 IMG_NAME := derailed/k9s
 IMAGE    := ${IMG_NAME}:${VERSION}
 

internal/config/config_test.go

@@ -261,13 +261,14 @@ func TestSetup(t *testing.T) {
 
 var expectedConfig = `k9s:
   refreshRate: 100
+  enableMouse: false
   headless: false
   readOnly: true
   noIcons: false
   logger:
     tail: 500
     buffer: 800
-    sinceSeconds: 300
+    sinceSeconds: 60
     fullScreenLogs: false
     textWrap: false
     showTime: false
@@ -341,13 +342,14 @@ var expectedConfig = `k9s:
 
 var resetConfig = `k9s:
   refreshRate: 2
+  enableMouse: false
   headless: false
   readOnly: false
   noIcons: false
   logger:
     tail: 200
     buffer: 2000
-    sinceSeconds: 300
+    sinceSeconds: 60
     fullScreenLogs: false
     textWrap: false
     showTime: false

internal/config/logger.go

@@ -10,11 +10,7 @@ const (
 	// MaxLogThreshold sets the max value for log size.
 	MaxLogThreshold = 5000
 	// DefaultSinceSeconds tracks default log age.
-<<<<<<< HEAD
 	DefaultSinceSeconds = 60 // all logs
-=======
-	DefaultSinceSeconds = 300
->>>>>>> 8f7640a75993a24409d6b3d9dd2204c24b7ac1a1
 )
 
 // Logger tracks logger options