|
@@ -100,18 +100,23 @@ func getFormatTest(cx ctlCtx) {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
tests := []struct {
|
|
tests := []struct {
|
|
|
- format string
|
|
|
|
|
|
|
+ format string
|
|
|
|
|
+ valueOnly bool
|
|
|
|
|
|
|
|
wstr string
|
|
wstr string
|
|
|
}{
|
|
}{
|
|
|
- {"simple", "abc"},
|
|
|
|
|
- {"json", `"kvs":[{"key":"YWJj"`},
|
|
|
|
|
- {"protobuf", "\x17\b\x93\xe7\xf6\x93\xd4ņ\xe14\x10\xed"},
|
|
|
|
|
|
|
+ {"simple", false, "abc"},
|
|
|
|
|
+ {"simple", true, "123"},
|
|
|
|
|
+ {"json", false, `"kvs":[{"key":"YWJj"`},
|
|
|
|
|
+ {"protobuf", false, "\x17\b\x93\xe7\xf6\x93\xd4ņ\xe14\x10\xed"},
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
for i, tt := range tests {
|
|
for i, tt := range tests {
|
|
|
cmdArgs := append(cx.PrefixArgs(), "get")
|
|
cmdArgs := append(cx.PrefixArgs(), "get")
|
|
|
cmdArgs = append(cmdArgs, "--write-out="+tt.format)
|
|
cmdArgs = append(cmdArgs, "--write-out="+tt.format)
|
|
|
|
|
+ if tt.valueOnly {
|
|
|
|
|
+ cmdArgs = append(cmdArgs, "--print-value-only")
|
|
|
|
|
+ }
|
|
|
cmdArgs = append(cmdArgs, "abc")
|
|
cmdArgs = append(cmdArgs, "abc")
|
|
|
if err := spawnWithExpect(cmdArgs, tt.wstr); err != nil {
|
|
if err := spawnWithExpect(cmdArgs, tt.wstr); err != nil {
|
|
|
cx.t.Errorf("#%d: error (%v), wanted %v", i, err, tt.wstr)
|
|
cx.t.Errorf("#%d: error (%v), wanted %v", i, err, tt.wstr)
|