From 143da807ce4f09d1a8449b602bf07b1496f228ff Mon Sep 17 00:00:00 2001 From: Alexey Mukas Date: Thu, 23 Mar 2023 21:38:00 +0100 Subject: [PATCH 1/5] enable tests --- managed/services/supervisord/logs_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/managed/services/supervisord/logs_test.go b/managed/services/supervisord/logs_test.go index 265e17c112..d343cb90e0 100644 --- a/managed/services/supervisord/logs_test.go +++ b/managed/services/supervisord/logs_test.go @@ -96,8 +96,6 @@ func TestReadLog(t *testing.T) { } func TestAddAdminSummary(t *testing.T) { - t.Skip("FIXME") - zipfile, err := os.CreateTemp("", "*-test.zip") assert.NoError(t, err) @@ -157,8 +155,6 @@ func TestFiles(t *testing.T) { } func TestZip(t *testing.T) { - t.Skip("FIXME") - checker := NewPMMUpdateChecker(logrus.WithField("test", t.Name())) l := NewLogs("2.4.5", checker) ctx := logger.Set(context.Background(), t.Name()) From 605c685621cd6978b9fc7898814b3859366e71df Mon Sep 17 00:00:00 2001 From: Alexey Mukas Date: Thu, 23 Mar 2023 22:22:28 +0100 Subject: [PATCH 2/5] trigger ci From 95ac85ef0cc65b8e3a623dd821e66dbc74db3390 Mon Sep 17 00:00:00 2001 From: Alexey Mukas Date: Thu, 23 Mar 2023 22:54:29 +0100 Subject: [PATCH 3/5] trigger ci From f1d4aeccdbf51d9b132ae074762bb2716ae0f06f Mon Sep 17 00:00:00 2001 From: Alex Tymchuk Date: Tue, 5 Sep 2023 02:23:05 +0300 Subject: [PATCH 4/5] PMM-7 fix the tests --- managed/services/supervisord/logs_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/managed/services/supervisord/logs_test.go b/managed/services/supervisord/logs_test.go index 18ab509b59..ae64109eb8 100644 --- a/managed/services/supervisord/logs_test.go +++ b/managed/services/supervisord/logs_test.go @@ -55,6 +55,7 @@ var commonExpectedFiles = []string{ "postgresql14.log", "qan-api2.ini", "qan-api2.log", + "supervisorctl_status.log", "supervisord.conf", "supervisord.log", "victoriametrics-promscrape.yml", @@ -170,9 +171,11 @@ func TestFiles(t *testing.T) { continue } - if f.Name == "supervisorctl_status.log" { - // FIXME: this fails following the transition to EL9 - continue + if f.Name != "supervisorctl_status.log" { + // Note: following the transition to EL9 querying this file generates an error. No workaround is available ATM. + assert.NoError(t, f.Err, "name = %q", f.Name) + } else { + assert.EqualError(t, f.Err, "exit status 3") } assert.NoError(t, f.Err, "name = %q", f.Name) From b6b38bec6cf1830d8e0fd9cf0a9f2ad44903c785 Mon Sep 17 00:00:00 2001 From: Alex Tymchuk Date: Tue, 5 Sep 2023 02:43:39 +0300 Subject: [PATCH 5/5] PMM-7 fix trailing comma --- managed/services/supervisord/logs_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/managed/services/supervisord/logs_test.go b/managed/services/supervisord/logs_test.go index ae64109eb8..dccd000c3a 100644 --- a/managed/services/supervisord/logs_test.go +++ b/managed/services/supervisord/logs_test.go @@ -55,7 +55,7 @@ var commonExpectedFiles = []string{ "postgresql14.log", "qan-api2.ini", "qan-api2.log", - "supervisorctl_status.log", + "supervisorctl_status.log", "supervisord.conf", "supervisord.log", "victoriametrics-promscrape.yml",