0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #29714 from vdemeester/small-requirement-fix

Browse source 
Display only the name of the requirement…
This commit is contained in:
Vincent Demeester 2016-12-27 13:21:43 +01:00 • committed by GitHub
commit e7d4269a50
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
integration-cli/requirement/requirement.go
View file

@ -2,8 +2,10 @@ package requirement
import (
"fmt"
"path"
"reflect"
"runtime"
"strings"
)
type skipT interface {
@ -20,7 +22,12 @@ func Is(s skipT, requirements ...Test) {
isValid := r()
if !isValid {
requirementFunc := runtime.FuncForPC(reflect.ValueOf(r).Pointer()).Name()
s.Skip(fmt.Sprintf("unmatched requirement %s", requirementFunc))
s.Skip(fmt.Sprintf("unmatched requirement %s", extractRequirement(requirementFunc)))
}
}
}
func extractRequirement(requirementFunc string) string {
requirement := path.Base(requirementFunc)
return strings.SplitN(requirement, ".", 2)[1]
}