From e69118ade71734fd59d1cf030a00d4a719e7ba05 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Fri, 14 Feb 2014 17:36:11 -0800 Subject: [PATCH] chore(tests/multi_node_kill_one): check function-call result To stop test in time if error occurs --- tests/functional/simple_multi_node_test.go | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/functional/simple_multi_node_test.go b/tests/functional/simple_multi_node_test.go index 72b96e98f..31c627b29 100644 --- a/tests/functional/simple_multi_node_test.go +++ b/tests/functional/simple_multi_node_test.go @@ -26,7 +26,7 @@ func templateTestSimpleMultiNode(t *testing.T, tls bool) { _, etcds, err := CreateCluster(clusterSize, procAttr, tls) if err != nil { - t.Fatal("cannot create cluster") + t.Fatalf("cannot create cluster: %v", err) } defer DestroyCluster(etcds) @@ -35,29 +35,30 @@ func templateTestSimpleMultiNode(t *testing.T, tls bool) { c := etcd.NewClient(nil) - c.SyncCluster() + if c.SyncCluster() == false { + t.Fatal("Cannot sync cluster!") + } // Test Set result, err := c.Set("foo", "bar", 100) + if err != nil { + t.Fatal(err) + } + node := result.Node - - if err != nil || node.Key != "/foo" || node.Value != "bar" || node.TTL < 95 { - if err != nil { - t.Fatal(err) - } - + if node.Key != "/foo" || node.Value != "bar" || node.TTL < 95 { t.Fatalf("Set 1 failed with %s %s %v", node.Key, node.Value, node.TTL) } time.Sleep(time.Second) result, err = c.Set("foo", "bar", 100) - node = result.Node + if err != nil { + t.Fatal(err) + } - if err != nil || node.Key != "/foo" || node.Value != "bar" || node.TTL < 95 { - if err != nil { - t.Fatal(err) - } + node = result.Node + if node.Key != "/foo" || node.Value != "bar" || node.TTL < 95 { t.Fatalf("Set 2 failed with %s %s %v", node.Key, node.Value, node.TTL) }