vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #40 from mrunalp/inc_deadline

Browse source 
Increase the deadline to 30 seconds in lint
This commit is contained in:
Antonio Murdaca 2016-09-19 22:46:12 +02:00 committed by GitHub
commit fffaa68949
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.tool/lint
View file

@ -20,5 +20,5 @@ for d in $(find . -type d -not -iwholename '*.git*' -a -not -iname '.tool' -a -n
--disable=gas \ --disable=gas \
--cyclo-over=50 \ --cyclo-over=50 \
--tests \ --tests \
--deadline=10s "${d}" --deadline=30s "${d}"
done done

2
server/utils.go
View file

@ -33,7 +33,7 @@ func sPtr(s string) *string {
func getGPRCVersion() (string, error) { func getGPRCVersion() (string, error) {
_, file, _, ok := runtime.Caller(0) _, file, _, ok := runtime.Caller(0)
if !ok { if !ok {
return "", errors.New("failed to recover the caller information.") return "", errors.New("failed to recover the caller information")
} }
ocidRoot := filepath.Dir(filepath.Dir(file)) ocidRoot := filepath.Dir(filepath.Dir(file))