fix timeout issue #8809

彭浩 · 彭浩 · commit ac4cda10960b · 2021-02-06T11:28:55.000+08:00
diff --git a/plugins/inputs/x509_cert/x509_cert.go b/plugins/inputs/x509_cert/x509_cert.go
@@ -280,7 +280,6 @@ func init() {
 	inputs.Add("x509_cert", func() telegraf.Input {
 		return &X509Cert{
 			Sources: []string{},
-			Timeout: internal.Duration{Duration: 5},
 		}
 	})
 }
diff --git a/plugins/inputs/x509_cert/x509_cert_test.go b/plugins/inputs/x509_cert/x509_cert_test.go
@@ -3,7 +3,6 @@ package x509_cert
 import (
 	"crypto/tls"
 	"encoding/base64"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"math/big"
@@ -367,23 +366,6 @@ func TestGatherCertMustNotTimeout(t *testing.T) {
 	assert.True(t, acc.HasMeasurement("x509_cert"))
 }
 
-func TestGatherCertMustTimeoutWithNoDuration(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-	m := &X509Cert{
-		Sources: []string{"https://www.influxdata.com:443"},
-		Timeout: internal.Duration{Duration: 5}, // duration is set to 5 when adding to inputs
-	}
-	m.Init()
-
-	var acc testutil.Accumulator
-	err := m.Gather(&acc)
-	require.NoError(t, err)
-	require.Contains(t, acc.Errors, errors.New("cannot get SSL cert 'https://www.influxdata.com:443': dial tcp: i/o timeout"))
-	assert.False(t, acc.HasMeasurement("x509_cert"))
-}
-
 func TestServerName(t *testing.T) {
 	tests := []struct {
 		name     string

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,6 @@ func init() {`
`280`	`280`	`inputs.Add("x509_cert", func() telegraf.Input {`
`281`	`281`	`return &X509Cert{`
`282`	`282`	`Sources: []string{},`
`283`		`- Timeout: internal.Duration{Duration: 5},`
`284`	`283`	`}`
`285`	`284`	`})`
`286`	`285`	`}`