prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1031 from pwittrock/fix_oomparsertest

Browse Source 
resolves #1030 oomparser_test should get the current year
This commit is contained in:
Phillip Wittrock 2016-01-04 11:36:34 -08:00
commit 38cf3a0972
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/oomparser/oomparser_test.go
View File

@ -16,8 +16,10 @@ package oomparser
import ( import (
"bufio" "bufio"
"fmt"
"os" "os"
"reflect" "reflect"
"strconv"
"testing" "testing"
"time" "time"
) )
@ -92,7 +94,8 @@ func TestGetProcessNamePid(t *testing.T) {
} }
const longForm = "Jan _2 15:04:05 2006" const longForm = "Jan _2 15:04:05 2006"
correctTime, err := time.ParseInLocation(longForm, "Jan 21 22:01:49 2015", time.Local) stringYear := strconv.Itoa(time.Now().Year())
correctTime, err := time.ParseInLocation(longForm, fmt.Sprintf("Jan 21 22:01:49 %s", stringYear), time.Local)
couldParseLine, err = getProcessNamePid(endLine, currentOomInstance) couldParseLine, err = getProcessNamePid(endLine, currentOomInstance)
if err != nil { if err != nil {
t.Errorf("good line fed to getProcessNamePid should yield no error, but had error %v", err) t.Errorf("good line fed to getProcessNamePid should yield no error, but had error %v", err)