jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix broken tests

mine
derailed 2020-09-15 09:16:39 -06:00
parent 9c84e651ec
commit 99e2a988e6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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

6
internal/config/config_test.go
View File

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

4
internal/config/logger.go
View File

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