From bd91b2ced2dde5899cadc8477d333e4ffe08f1aa Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Fri, 18 Nov 2022 09:38:40 -0700 Subject: [PATCH] test(outputs.sql): print out what we get, bump time required (#12262) --- plugins/outputs/sql/sql_test.go | 3 ++- plugins/outputs/sql/testdata/mariadb/expected_metric_one.sql | 2 +- plugins/outputs/sql/testdata/mariadb/expected_metric_three.sql | 2 +- plugins/outputs/sql/testdata/mariadb/expected_metric_two.sql | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/outputs/sql/sql_test.go b/plugins/outputs/sql/sql_test.go index aedb8eb7c..42d1acb9b 100644 --- a/plugins/outputs/sql/sql_test.go +++ b/plugins/outputs/sql/sql_test.go @@ -235,8 +235,9 @@ func TestMysqlIntegration(t *testing.T) { bytes, err := io.ReadAll(out) require.NoError(t, err) + fmt.Println(string(bytes)) return strings.Contains(string(bytes), string(expected)) - }, 5*time.Second, 500*time.Millisecond) + }, 10*time.Second, 500*time.Millisecond, tc.expectedFile) } } diff --git a/plugins/outputs/sql/testdata/mariadb/expected_metric_one.sql b/plugins/outputs/sql/testdata/mariadb/expected_metric_one.sql index c1cd22f69..44e782127 100644 --- a/plugins/outputs/sql/testdata/mariadb/expected_metric_one.sql +++ b/plugins/outputs/sql/testdata/mariadb/expected_metric_one.sql @@ -1,6 +1,6 @@ /*!40101 SET character_set_client = utf8 */; CREATE TABLE `metric_one` ( - `timestamp` timestamp NOT NULL DEFAULT current_timestamp(), + `timestamp` timestamp NULL DEFAULT NULL, `tag_one` text DEFAULT NULL, `tag_two` text DEFAULT NULL, `int64_one` int(11) DEFAULT NULL, diff --git a/plugins/outputs/sql/testdata/mariadb/expected_metric_three.sql b/plugins/outputs/sql/testdata/mariadb/expected_metric_three.sql index 62fef63d8..8c75bcf8f 100644 --- a/plugins/outputs/sql/testdata/mariadb/expected_metric_three.sql +++ b/plugins/outputs/sql/testdata/mariadb/expected_metric_three.sql @@ -1,6 +1,6 @@ /*!40101 SET character_set_client = utf8 */; CREATE TABLE `metric three` ( - `timestamp` timestamp NOT NULL DEFAULT current_timestamp(), + `timestamp` timestamp NULL DEFAULT NULL, `tag four` text DEFAULT NULL, `string two` text DEFAULT NULL ); diff --git a/plugins/outputs/sql/testdata/mariadb/expected_metric_two.sql b/plugins/outputs/sql/testdata/mariadb/expected_metric_two.sql index 535a22d87..92be4e8bc 100644 --- a/plugins/outputs/sql/testdata/mariadb/expected_metric_two.sql +++ b/plugins/outputs/sql/testdata/mariadb/expected_metric_two.sql @@ -1,6 +1,6 @@ /*!40101 SET character_set_client = utf8 */; CREATE TABLE `metric_two` ( - `timestamp` timestamp NOT NULL DEFAULT current_timestamp(), + `timestamp` timestamp NULL DEFAULT NULL, `tag_three` text DEFAULT NULL, `string_one` text DEFAULT NULL );