Rebased upstream - Fixed NPE

This commit is contained in:
Jim Powers 2019-11-18 07:38:48 -05:00
parent 5dafdb1de6
commit 615e70ef22
2 changed files with 3 additions and 3 deletions

View File

@ -114,7 +114,7 @@ func (c *Context) Lineage() []*Context {
return lineage return lineage
} }
// value returns the value of the flag corresponding to `name` // Value returns the value of the flag corresponding to `name`
func (c *Context) Value(name string) interface{} { func (c *Context) Value(name string) interface{} {
return c.flagSet.Lookup(name).Value.(flag.Getter).Get() return c.flagSet.Lookup(name).Value.(flag.Getter).Get()
} }

View File

@ -3,8 +3,8 @@ package cli
import ( import (
"context" "context"
"flag" "flag"
"sort"
"os" "os"
"sort"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -328,7 +328,7 @@ func TestContextPropagation(t *testing.T) {
parent := NewContext(nil, nil, nil) parent := NewContext(nil, nil, nil)
parent.Context = context.WithValue(context.Background(), "key", "val") parent.Context = context.WithValue(context.Background(), "key", "val")
ctx := NewContext(nil, nil, parent) ctx := NewContext(nil, nil, parent)
val := ctx.Value("key") val := ctx.Context.Value("key")
if val == nil { if val == nil {
t.Fatal("expected a parent context to be inherited but got nil") t.Fatal("expected a parent context to be inherited but got nil")
} }