test: harden running of testcontainer integration tests (#11245)

influxdata · Jul 6, 2022 · 524054a · 524054a
1 parent 27d96ff
commit 524054a
Show file tree

Hide file tree

Showing 9 changed files with 234 additions and 289 deletions.
diff --git a/plugins/inputs/elasticsearch_query/elasticsearch_query_test.go b/plugins/inputs/elasticsearch_query/elasticsearch_query_test.go
@@ -505,7 +505,7 @@ var testEsAggregationData = []esAggregationQueryTest{
 	},
 }
 
-func setupIntegrationTest(t *testing.T) (testutil.Container, error) {
+func setupIntegrationTest(t *testing.T) (*testutil.Container, error) {
 	type nginxlog struct {
 		IPaddress    string    `json:"IP"`
 		Timestamp    time.Time `json:"@timestamp"`
@@ -542,15 +542,15 @@ func setupIntegrationTest(t *testing.T) (testutil.Container, error) {
 
 	err = e.connectToES()
 	if err != nil {
-		return container, err
+		return &container, err
 	}
 
 	bulkRequest := e.esClient.Bulk()
 
 	// populate elasticsearch with nginx_logs test data file
 	file, err := os.Open("testdata/nginx_logs")
 	if err != nil {
-		return container, err
+		return &container, err
 	}
 
 	defer file.Close()
@@ -579,22 +579,22 @@ func setupIntegrationTest(t *testing.T) (testutil.Container, error) {
 			Doc(logline))
 	}
 	if scanner.Err() != nil {
-		return container, err
+		return &container, err
 	}
 
 	_, err = bulkRequest.Do(context.Background())
 	if err != nil {
-		return container, err
+		return &container, err
 	}
 
 	// force elastic to refresh indexes to get new batch data
 	ctx := context.Background()
 	_, err = e.esClient.Refresh().Do(ctx)
 	if err != nil {
-		return container, err
+		return &container, err
 	}
 
-	return container, nil
+	return &container, nil
 }
 
 func TestElasticsearchQuery(t *testing.T) {

diff --git a/plugins/inputs/mysql/mysql_test.go b/plugins/inputs/mysql/mysql_test.go
@@ -25,7 +25,10 @@ func TestMysqlDefaultsToLocalIntegration(t *testing.T) {
 			"MYSQL_ALLOW_EMPTY_PASSWORD": "yes",
 		},
 		ExposedPorts: []string{servicePort},
-		WaitingFor:   wait.ForListeningPort(nat.Port(servicePort)),
+		WaitingFor: wait.ForAll(
+			wait.ForLog("/usr/sbin/mysqld: ready for connections"),
+			wait.ForListeningPort(nat.Port(servicePort)),
+		),
 	}
 
 	err := container.Start()
@@ -59,7 +62,10 @@ func TestMysqlMultipleInstancesIntegration(t *testing.T) {
 			"MYSQL_ALLOW_EMPTY_PASSWORD": "yes",
 		},
 		ExposedPorts: []string{servicePort},
-		WaitingFor:   wait.ForListeningPort(nat.Port(servicePort)),
+		WaitingFor: wait.ForAll(
+			wait.ForLog("/usr/sbin/mysqld: ready for connections"),
+			wait.ForListeningPort(nat.Port(servicePort)),
+		),
 	}
 
 	err := container.Start()

diff --git a/plugins/inputs/openldap/openldap_test.go b/plugins/inputs/openldap/openldap_test.go
@@ -71,7 +71,7 @@ func TestOpenldapGeneratesMetricsIntegration(t *testing.T) {
 			"LDAP_ADMIN_PASSWORD": "secret",
 		},
 		WaitingFor: wait.ForAll(
-			wait.ForLog("Starting slapd"),
+			wait.ForLog("slapd starting"),
 			wait.ForListeningPort(nat.Port(servicePort)),
 		),
 	}
@@ -128,7 +128,7 @@ func TestOpenldapStartTLSIntegration(t *testing.T) {
 			"/server.key": tlsKey,
 		},
 		WaitingFor: wait.ForAll(
-			wait.ForLog("Starting slapd"),
+			wait.ForLog("slapd starting"),
 			wait.ForListeningPort(nat.Port(servicePort)),
 		),
 	}
@@ -191,7 +191,7 @@ func TestOpenldapLDAPSIntegration(t *testing.T) {
 			"/server.key": tlsKey,
 		},
 		WaitingFor: wait.ForAll(
-			wait.ForLog("Starting slapd"),
+			wait.ForLog("slapd starting"),
 			wait.ForListeningPort(nat.Port(servicePortSecure)),
 		),
 	}
@@ -249,7 +249,7 @@ func TestOpenldapInvalidSSLIntegration(t *testing.T) {
 			"/server.key": tlsKey,
 		},
 		WaitingFor: wait.ForAll(
-			wait.ForLog("Starting slapd"),
+			wait.ForLog("slapd starting"),
 			wait.ForListeningPort(nat.Port(servicePortSecure)),
 		),
 	}
@@ -289,7 +289,7 @@ func TestOpenldapBindIntegration(t *testing.T) {
 			"LDAP_ADMIN_PASSWORD": "secret",
 		},
 		WaitingFor: wait.ForAll(
-			wait.ForLog("Starting slapd"),
+			wait.ForLog("slapd starting"),
 			wait.ForListeningPort(nat.Port(servicePort)),
 		),
 	}
@@ -341,7 +341,7 @@ func TestOpenldapReverseMetricsIntegration(t *testing.T) {
 			"LDAP_ADMIN_PASSWORD": "secret",
 		},
 		WaitingFor: wait.ForAll(
-			wait.ForLog("Starting slapd"),
+			wait.ForLog("slapd starting"),
 			wait.ForListeningPort(nat.Port(servicePort)),
 		),
 	}

diff --git a/plugins/inputs/pgbouncer/pgbouncer_test.go b/plugins/inputs/pgbouncer/pgbouncer_test.go
@@ -41,7 +41,10 @@ func TestPgBouncerGeneratesMetricsIntegration(t *testing.T) {
 			"PG_ENV_POSTGRESQL_USER": "pgbouncer",
 			"PG_ENV_POSTGRESQL_PASS": "pgbouncer",
 		},
-		WaitingFor: wait.ForListeningPort(nat.Port(pgBouncerServicePort)),
+		WaitingFor: wait.ForAll(
+			wait.ForListeningPort(nat.Port(pgBouncerServicePort)),
+			wait.ForLog("LOG process up"),
+		),
 	}
 	err = container.Start()
 	require.NoError(t, err, "failed to start container")