status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #175 from nelhage/fix-tests 

Fix some issues in tests.
This commit is contained in:
William Tisäter 2014-05-26 22:38:27 +02:00
parent 37f49427e1 2080122f38
commit f5bd176fb3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/check_test.go
View File

@ -74,7 +74,7 @@ func TestCheckMonitor_LimitOutput(t *testing.T) {
check := &CheckMonitor{ check := &CheckMonitor{
Notify: mock, Notify: mock,
CheckID: "foo", CheckID: "foo",
Script: "dd if=/dev/urandom bs=8192 count=10", Script: "od -N 81920 /dev/urandom",
Interval: 25 * time.Millisecond, Interval: 25 * time.Millisecond,
Logger: log.New(os.Stderr, "", log.LstdFlags), Logger: log.New(os.Stderr, "", log.LstdFlags),
} }

2
testutil/wait.go
View File

@ -36,7 +36,7 @@ func WaitForLeader(t *testing.T, rpc rpcFn, dc string) structs.IndexedNodes {
Datacenter: dc, Datacenter: dc,
} }
err := rpc("Catalog.ListNodes", args, &out) err := rpc("Catalog.ListNodes", args, &out)
return out.QueryMeta.KnownLeader, err return out.QueryMeta.KnownLeader && out.Index > 0, err
}, func(err error) { }, func(err error) {
t.Fatalf("failed to find leader: %v", err) t.Fatalf("failed to find leader: %v", err)
}) })