ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

plugins/noop: return a helpful message for test authors

Browse Source 
Signed-off-by: Gabe Rosenhouse <grosenhouse@pivotal.io>
This commit is contained in:
Konstantinos Karampogias
2016-10-27 10:47:04 -07:00
committed by Gabe Rosenhouse
parent b0808a006a
commit accac60053
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/test/noop/main.go
View File

@ -29,7 +29,7 @@ import (
"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/version"
"github.com/containernetworking/cni/plugins/test/noop/debug"
noop_debug "github.com/containernetworking/cni/plugins/test/noop/debug"
)
// parse extra args i.e. FOO=BAR;ABC=123
@ -60,7 +60,7 @@ func debugBehavior(args *skel.CmdArgs, command string) error {
return nil
}
debug, err := debug.ReadDebug(debugFilePath)
debug, err := noop_debug.ReadDebug(debugFilePath)
if err != nil {
return err
}
@ -68,6 +68,10 @@ func debugBehavior(args *skel.CmdArgs, command string) error {
debug.CmdArgs = *args
debug.Command = command
if debug.ReportResult == "" {
debug.ReportResult = fmt.Sprintf(` { "result": %q }`, noop_debug.EmptyReportResultMessage)
}
err = debug.WriteDebug(debugFilePath)
if err != nil {
return err
@ -101,7 +105,7 @@ func debugGetSupportedVersions() []string {
panic("test setup error: missing DEBUG in CNI_ARGS")
}
debug, err := debug.ReadDebug(debugFilePath)
debug, err := noop_debug.ReadDebug(debugFilePath)
if err != nil {
panic("test setup error: unable to read debug file: " + err.Error())
}