Merge pull request #11001 from satnam6502/e2e-es

Fix error with variable re-declaration in ES logging test
This commit is contained in:
Victor Marmol
2015-07-09 14:23:39 -07:00

View File

@@ -97,9 +97,10 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
var statusCode float64
var esResponse map[string]interface{}
err = nil
var body []byte
for start := time.Now(); time.Since(start) < graceTime; time.Sleep(5 * time.Second) {
// Query against the root URL for Elasticsearch.
body, err := f.Client.Get().
body, err = f.Client.Get().
Namespace(api.NamespaceSystem).
Prefix("proxy").
Resource("services").
@@ -143,7 +144,6 @@ func ClusterLevelLoggingWithElasticsearch(f *Framework) {
// Now assume we really are talking to an Elasticsearch instance.
// Check the cluster health.
By("Checking health of Elasticsearch service.")
var body []byte
for start := time.Now(); time.Since(start) < graceTime; time.Sleep(5 * time.Second) {
body, err = f.Client.Get().
Namespace(api.NamespaceSystem).