mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #10229 from gyuho/fix-flag-tests
pkg/flags: fix "TestSetFlagsFromEnvParsingError"
This commit is contained in:
commit
8e907e48f9
@ -17,6 +17,7 @@ package flags
|
|||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"os"
|
"os"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -80,7 +81,14 @@ func TestSetFlagsFromEnvParsingError(t *testing.T) {
|
|||||||
}
|
}
|
||||||
defer os.Unsetenv("ETCD_HEARTBEAT_INTERVAL")
|
defer os.Unsetenv("ETCD_HEARTBEAT_INTERVAL")
|
||||||
|
|
||||||
if serr := SetFlagsFromEnv("ETCD", fs); serr.Error() != `invalid value "100 # ms" for ETCD_HEARTBEAT_INTERVAL: strconv.ParseUint: parsing "100 # ms": invalid syntax` {
|
err := SetFlagsFromEnv("ETCD", fs)
|
||||||
t.Fatalf("expected parsing error, got %v", serr)
|
for _, v := range []string{"invalid syntax", "parse error"} {
|
||||||
|
if strings.Contains(err.Error(), v) {
|
||||||
|
err = nil
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user