Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: add watch tests with ETCDCTL_WATCH_*

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-01-14 01:36:13 -08:00
parent 8183b83220
commit 503781e3a0
1 changed files with 83 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
e2e/ctl_v3_watch_test.go
View File

@ -15,6 +15,7 @@
package e2e package e2e
import ( import (
"os"
"strings" "strings"
"testing" "testing"
) )
@ -45,55 +46,89 @@ type kvExec struct {
func watchTest(cx ctlCtx) { func watchTest(cx ctlCtx) {
tests := []struct { tests := []struct {
puts []kv puts []kv
args []string envKey string
envRange string
args []string
wkv []kvExec wkv []kvExec
}{ }{
{ // watch 1 key { // watch 1 key
[]kv{{"sample", "value"}}, puts: []kv{{"sample", "value"}},
[]string{"sample", "--rev", "1"}, args: []string{"sample", "--rev", "1"},
[]kvExec{{key: "sample", val: "value"}}, wkv: []kvExec{{key: "sample", val: "value"}},
},
{ // watch 1 key with env
puts: []kv{{"sample", "value"}},
envKey: "sample",
args: []string{"--rev", "1"},
wkv: []kvExec{{key: "sample", val: "value"}},
}, },
{ // watch 1 key with "echo watch event received" { // watch 1 key with "echo watch event received"
[]kv{{"sample", "value"}}, puts: []kv{{"sample", "value"}},
[]string{"sample", "--rev", "1", "--", "echo", "watch event received"}, args: []string{"sample", "--rev", "1", "--", "echo", "watch event received"},
[]kvExec{{key: "sample", val: "value", execOutput: "watch event received"}}, wkv: []kvExec{{key: "sample", val: "value", execOutput: "watch event received"}},
},
{ // watch 1 key with "echo watch event received", with env
puts: []kv{{"sample", "value"}},
envKey: "sample",
args: []string{"--rev", "1", "--", "echo", "watch event received"},
wkv: []kvExec{{key: "sample", val: "value", execOutput: "watch event received"}},
}, },
{ // watch 1 key with "echo watch event received" { // watch 1 key with "echo watch event received"
[]kv{{"sample", "value"}}, puts: []kv{{"sample", "value"}},
[]string{"--rev", "1", "sample", "--", "echo", "watch event received"}, args: []string{"--rev", "1", "sample", "--", "echo", "watch event received"},
[]kvExec{{key: "sample", val: "value", execOutput: "watch event received"}}, wkv: []kvExec{{key: "sample", val: "value", execOutput: "watch event received"}},
}, },
{ // watch 1 key with "echo \"Hello World!\"" { // watch 1 key with "echo \"Hello World!\""
[]kv{{"sample", "value"}}, puts: []kv{{"sample", "value"}},
[]string{"--rev", "1", "sample", "--", "echo", "\"Hello World!\""}, args: []string{"--rev", "1", "sample", "--", "echo", "\"Hello World!\""},
[]kvExec{{key: "sample", val: "value", execOutput: "Hello World!"}}, wkv: []kvExec{{key: "sample", val: "value", execOutput: "Hello World!"}},
}, },
{ // watch 1 key with "echo watch event received" { // watch 1 key with "echo watch event received"
[]kv{{"sample", "value"}}, puts: []kv{{"sample", "value"}},
[]string{"sample", "samplx", "--rev", "1", "--", "echo", "watch event received"}, args: []string{"sample", "samplx", "--rev", "1", "--", "echo", "watch event received"},
[]kvExec{{key: "sample", val: "value", execOutput: "watch event received"}}, wkv: []kvExec{{key: "sample", val: "value", execOutput: "watch event received"}},
}, },
{ // watch 1 key with "echo watch event received" { // watch 1 key with "echo watch event received"
[]kv{{"sample", "value"}}, puts: []kv{{"sample", "value"}},
[]string{"sample", "--rev", "1", "samplx", "--", "echo", "watch event received"}, envKey: "sample",
[]kvExec{{key: "sample", val: "value", execOutput: "watch event received"}}, envRange: "samplx",
args: []string{"--rev", "1", "--", "echo", "watch event received"},
wkv: []kvExec{{key: "sample", val: "value", execOutput: "watch event received"}},
},
{ // watch 1 key with "echo watch event received"
puts: []kv{{"sample", "value"}},
args: []string{"sample", "--rev", "1", "samplx", "--", "echo", "watch event received"},
wkv: []kvExec{{key: "sample", val: "value", execOutput: "watch event received"}},
}, },
{ // watch 3 keys by prefix { // watch 3 keys by prefix
[]kv{{"key1", "val1"}, {"key2", "val2"}, {"key3", "val3"}}, puts: []kv{{"key1", "val1"}, {"key2", "val2"}, {"key3", "val3"}},
[]string{"key", "--rev", "1", "--prefix"}, args: []string{"key", "--rev", "1", "--prefix"},
[]kvExec{{key: "key1", val: "val1"}, {key: "key2", val: "val2"}, {key: "key3", val: "val3"}}, wkv: []kvExec{{key: "key1", val: "val1"}, {key: "key2", val: "val2"}, {key: "key3", val: "val3"}},
},
{ // watch 3 keys by prefix, with env
puts: []kv{{"key1", "val1"}, {"key2", "val2"}, {"key3", "val3"}},
envKey: "key",
args: []string{"--rev", "1", "--prefix"},
wkv: []kvExec{{key: "key1", val: "val1"}, {key: "key2", val: "val2"}, {key: "key3", val: "val3"}},
}, },
{ // watch by revision { // watch by revision
[]kv{{"etcd", "revision_1"}, {"etcd", "revision_2"}, {"etcd", "revision_3"}}, puts: []kv{{"etcd", "revision_1"}, {"etcd", "revision_2"}, {"etcd", "revision_3"}},
[]string{"etcd", "--rev", "2"}, args: []string{"etcd", "--rev", "2"},
[]kvExec{{key: "etcd", val: "revision_2"}, {key: "etcd", val: "revision_3"}}, wkv: []kvExec{{key: "etcd", val: "revision_2"}, {key: "etcd", val: "revision_3"}},
}, },
{ // watch 3 keys by range { // watch 3 keys by range
[]kv{{"key1", "val1"}, {"key3", "val3"}, {"key2", "val2"}}, puts: []kv{{"key1", "val1"}, {"key3", "val3"}, {"key2", "val2"}},
[]string{"key", "key3", "--rev", "1"}, args: []string{"key", "key3", "--rev", "1"},
[]kvExec{{key: "key1", val: "val1"}, {key: "key2", val: "val2"}}, wkv: []kvExec{{key: "key1", val: "val1"}, {key: "key2", val: "val2"}},
},
{ // watch 3 keys by range, with env
puts: []kv{{"key1", "val1"}, {"key3", "val3"}, {"key2", "val2"}},
envKey: "key",
envRange: "key3",
args: []string{"--rev", "1"},
wkv: []kvExec{{key: "key1", val: "val1"}, {key: "key2", val: "val2"}},
}, },
} }
@ -107,11 +142,30 @@ func watchTest(cx ctlCtx) {
} }
close(donec) close(donec)
}(i, tt.puts) }(i, tt.puts)
unsetEnv := func() {}
if tt.envKey != "" || tt.envRange != "" {
if tt.envKey != "" {
os.Setenv("ETCDCTL_WATCH_KEY", tt.envKey)
unsetEnv = func() { os.Unsetenv("ETCDCTL_WATCH_KEY") }
}
if tt.envRange != "" {
os.Setenv("ETCDCTL_WATCH_RANGE_END", tt.envRange)
unsetEnv = func() { os.Unsetenv("ETCDCTL_WATCH_RANGE_END") }
}
if tt.envKey != "" && tt.envRange != "" {
unsetEnv = func() {
os.Unsetenv("ETCDCTL_WATCH_KEY")
os.Unsetenv("ETCDCTL_WATCH_RANGE_END")
}
}
}
if err := ctlV3Watch(cx, tt.args, tt.wkv...); err != nil { if err := ctlV3Watch(cx, tt.args, tt.wkv...); err != nil {
if cx.dialTimeout > 0 && !isGRPCTimedout(err) { if cx.dialTimeout > 0 && !isGRPCTimedout(err) {
cx.t.Errorf("watchTest #%d: ctlV3Watch error (%v)", i, err) cx.t.Errorf("watchTest #%d: ctlV3Watch error (%v)", i, err)
} }
} }
unsetEnv()
<-donec <-donec
} }
} }