status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-28 22:45:58 +00:00
Code Issues Projects Releases Wiki Activity

agent: make rpc tests more reliable

Browse Source
This commit is contained in:
Ryan Uber 2014-10-04 15:35:18 -07:00
parent 80c25e3320
commit c945311baf
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
command/agent/rpc_client_test.go
View File

@ -293,7 +293,7 @@ func TestRPCClientListKeys(t *testing.T) {
if _, ok := keys["dc1"][key1]; !ok { if _, ok := keys["dc1"][key1]; !ok {
t.Fatalf("bad: %#v", keys) t.Fatalf("bad: %#v", keys)
} }
if _, ok := keys["wan"][key1]; !ok { if _, ok := keys["WAN"][key1]; !ok {
t.Fatalf("bad: %#v", keys) t.Fatalf("bad: %#v", keys)
} }
} }
@ -301,18 +301,23 @@ func TestRPCClientListKeys(t *testing.T) {
func TestRPCClientInstallKey(t *testing.T) { func TestRPCClientInstallKey(t *testing.T) {
key1 := "tbLJg26ZJyJ9pK3qhc9jig==" key1 := "tbLJg26ZJyJ9pK3qhc9jig=="
key2 := "xAEZ3uVHRMZD9GcYMZaRQw==" key2 := "xAEZ3uVHRMZD9GcYMZaRQw=="
conf := Config{EncryptKey: key1, Server: true} conf := Config{EncryptKey: key1}
p1 := testRPCClientWithConfig(t, &conf) p1 := testRPCClientWithConfig(t, &conf)
defer p1.Close() defer p1.Close()
// key2 is not installed yet // key2 is not installed yet
testutil.WaitForResult(func() (bool, error) {
keys := listKeys(t, p1.client) keys := listKeys(t, p1.client)
if num, ok := keys["dc1"][key2]; ok || num != 0 { if num, ok := keys["dc1"][key2]; ok || num != 0 {
t.Fatalf("bad: %#v", keys) return false, fmt.Errorf("bad: %#v", keys)
} }
if num, ok := keys["wan"][key2]; ok || num != 0 { if num, ok := keys["WAN"][key2]; ok || num != 0 {
t.Fatalf("bad: %#v", keys) return false, fmt.Errorf("bad: %#v", keys)
} }
return true, nil
}, func(err error) {
t.Fatal(err.Error())
})
// install key2 // install key2
r, err := p1.client.InstallKey(key2) r, err := p1.client.InstallKey(key2)
@ -322,19 +327,24 @@ func TestRPCClientInstallKey(t *testing.T) {
keyringSuccess(t, r) keyringSuccess(t, r)
// key2 should now be installed // key2 should now be installed
keys = listKeys(t, p1.client) testutil.WaitForResult(func() (bool, error) {
keys := listKeys(t, p1.client)
if num, ok := keys["dc1"][key2]; !ok || num != 1 { if num, ok := keys["dc1"][key2]; !ok || num != 1 {
t.Fatalf("bad: %#v", keys) return false, fmt.Errorf("bad: %#v", keys)
} }
if num, ok := keys["wan"][key2]; !ok || num != 1 { if num, ok := keys["WAN"][key2]; !ok || num != 1 {
t.Fatalf("bad: %#v", keys) return false, fmt.Errorf("bad: %#v", keys)
} }
return true, nil
}, func(err error) {
t.Fatal(err.Error())
})
} }
func TestRPCClientUseKey(t *testing.T) { func TestRPCClientUseKey(t *testing.T) {
key1 := "tbLJg26ZJyJ9pK3qhc9jig==" key1 := "tbLJg26ZJyJ9pK3qhc9jig=="
key2 := "xAEZ3uVHRMZD9GcYMZaRQw==" key2 := "xAEZ3uVHRMZD9GcYMZaRQw=="
conf := Config{EncryptKey: key1, Server: true} conf := Config{EncryptKey: key1}
p1 := testRPCClientWithConfig(t, &conf) p1 := testRPCClientWithConfig(t, &conf)
defer p1.Close() defer p1.Close()
@ -346,13 +356,18 @@ func TestRPCClientUseKey(t *testing.T) {
keyringSuccess(t, r) keyringSuccess(t, r)
// key2 is installed // key2 is installed
testutil.WaitForResult(func() (bool, error) {
keys := listKeys(t, p1.client) keys := listKeys(t, p1.client)
if num, ok := keys["dc1"][key2]; !ok || num != 1 { if num, ok := keys["dc1"][key2]; !ok || num != 1 {
t.Fatalf("bad: %#v", keys) return false, fmt.Errorf("bad: %#v", keys)
} }
if num, ok := keys["wan"][key2]; !ok || num != 1 { if num, ok := keys["WAN"][key2]; !ok || num != 1 {
t.Fatalf("bad: %#v", keys) return false, fmt.Errorf("bad: %#v", keys)
} }
return true, nil
}, func(err error) {
t.Fatal(err.Error())
})
// can't remove key1 yet // can't remove key1 yet
r, err = p1.client.RemoveKey(key1) r, err = p1.client.RemoveKey(key1)
@ -396,7 +411,7 @@ func listKeys(t *testing.T, c *RPCClient) map[string]map[string]int {
for _, k := range resp.Keys { for _, k := range resp.Keys {
respID := k.Datacenter respID := k.Datacenter
if k.Pool == "WAN" { if k.Pool == "WAN" {
respID = "wan" respID = k.Pool
} }
out[respID] = map[string]int{k.Key: k.Count} out[respID] = map[string]int{k.Key: k.Count}
} }