Fix test

closes #771
influxdata · Mar 1, 2016 · fe43fb4 · fe43fb4
1 parent ca3a80f
commit fe43fb4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 - [#692](https://github.com/influxdata/telegraf/pull/770): Support InfluxDB retention policies
+- [#771](https://github.com/influxdata/telegraf/pull/771): Default timeouts for input plugns. Thanks @PierreF!
 
 ### Bugfixes
 - [#748](https://github.com/influxdata/telegraf/issues/748): Fix sensor plugin split on ":"

diff --git a/plugins/inputs/elasticsearch/elasticsearch_test.go b/plugins/inputs/elasticsearch/elasticsearch_test.go
@@ -34,6 +34,9 @@ func (t *transportMock) RoundTrip(r *http.Request) (*http.Response, error) {
 	return res, nil
 }
 
+func (t *transportMock) CancelRequest(_ *http.Request) {
+}
+
 func TestElasticsearch(t *testing.T) {
 	es := NewElasticsearch()
 	es.Servers = []string{"http://example.com:9200"}

diff --git a/plugins/inputs/mysql/mysql_test.go b/plugins/inputs/mysql/mysql_test.go
@@ -92,7 +92,7 @@ func TestMysqlDNSAddTimeout(t *testing.T) {
 	}{
 		{
 			"",
-			"/?timeout=5",
+			"/?timeout=5s",
 		},
 		{
 			"tcp(192.168.1.1:3306)/",
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ func TestMysqlDNSAddTimeout(t *testing.T) { @@
     	}{
     		{
     			"",
-    			"/?timeout=5",
+    			"/?timeout=5s",
     		},
     		{
     			"tcp(192.168.1.1:3306)/",
@@ Expand Down @@