Merge pull request #102 from andrewkroh/agonzalezro-dead_timeout-test

ruflin · ruflin · commit dd2535ef27c3 · 2015-09-23T22:44:18.000+02:00
Agonzalezro dead timeout test
diff --git a/outputs/elasticsearch/connection_pool_test.go b/outputs/elasticsearch/connection_pool_test.go
@@ -75,32 +75,23 @@ func TestDeadTimeout(t *testing.T) {
 	}
 
 	var pool ConnectionPool
-
 	urls := []string{"localhost:9200", "localhost:9201"}
-
 	err := pool.SetConnections(urls, "test", "secret")
 	if err != nil {
 		t.Errorf("Fail to set the connections: %s", err)
 	}
-	pool.SetDeadTimeout(10)
+	// Set dead timeout to zero so that dead connections are immediately
+	// returned to the pool.
+	pool.SetDeadTimeout(0)
 
 	conn := pool.GetConnection()
+	assertExpectedConnectionURL(t, conn.URL, urls[0])
 
-	if conn.URL != "localhost:9200" {
-		t.Errorf("Wrong connection returned: %s", conn.URL)
-	}
 	pool.MarkDead(conn)
-	time.Sleep(10 * time.Second)
-
-	conn = pool.GetConnection()
-	if conn.URL != "localhost:9201" {
-		t.Errorf("Wrong connection returned: %s", conn.URL)
-	}
+	time.Sleep(1 * time.Millisecond)
 
-	conn = pool.GetConnection()
-	if conn.URL != "localhost:9200" {
-		t.Errorf("Wrong connection returned: %s", conn.URL)
-	}
+	assertExpectedConnectionURL(t, pool.GetConnection().URL, urls[1])
+	assertExpectedConnectionURL(t, pool.GetConnection().URL, urls[0])
 }
 
 func TestMarkLive(t *testing.T) {
@@ -130,5 +121,10 @@ func TestMarkLive(t *testing.T) {
 	if conn.URL != "localhost:9200" {
 		t.Errorf("Wrong connection returned: %s", conn.URL)
 	}
+}
 
+func assertExpectedConnectionURL(t testing.TB, returned, expected string) {
+	if returned != expected {
+		t.Errorf("Wrong connection returned: %s, expecting: %s", returned, expected)
+	}
 }
