From 2148f8a03958f649dc64908d78bf94342bb14f8a Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Mon, 21 Oct 2024 14:24:34 +0300 Subject: [PATCH 1/2] PMM-7 fix PG versions --- tests/qa-integration/pmm_pgsm_integration_test.js | 8 +++++--- tests/qa-integration/pmm_pgss_integration_test.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/qa-integration/pmm_pgsm_integration_test.js b/tests/qa-integration/pmm_pgsm_integration_test.js index d3c614072..27c322495 100644 --- a/tests/qa-integration/pmm_pgsm_integration_test.js +++ b/tests/qa-integration/pmm_pgsm_integration_test.js @@ -13,7 +13,7 @@ const connection = { // Service Name: ${PGSQL_PGSM_CONTAINER}_${PGSQL_VERSION}_service // Docker Container Name: ${PGSQL_PGSM_CONTAINER}_${PGSQL_VERSION} -const version = process.env.PGSQL_VERSION ? `${process.env.PGSQL_VERSION}` : '14'; +const version = process.env.PGSQL_VERSION ? `${process.env.PGSQL_VERSION}` : '17'; const container = process.env.PGSQL_PGSM_CONTAINER ? `${process.env.PGSQL_PGSM_CONTAINER}` : 'pgsql_pgsm'; const database = `pgsm${Math.floor(Math.random() * 99) + 1}`; const pgsm_service_name = `${container}_${version}_service`; @@ -233,8 +233,10 @@ Scenario( await dashboardPage.verifyThereAreNoGraphsWithoutData(1); const log = await I.verifyCommand(`docker exec ${container_name} cat pmm-agent.log`); - I.assertFalse(log.includes('Error opening connection to database \(postgres'), - 'The log wasn\'t supposed to contain errors regarding connection to postgress database but it does'); + I.assertFalse( + log.includes('Error opening connection to database \(postgres'), + 'The log wasn\'t supposed to contain errors regarding connection to postgress database but it does', + ); }, ); diff --git a/tests/qa-integration/pmm_pgss_integration_test.js b/tests/qa-integration/pmm_pgss_integration_test.js index bcdbc4aae..26b196e9a 100644 --- a/tests/qa-integration/pmm_pgss_integration_test.js +++ b/tests/qa-integration/pmm_pgss_integration_test.js @@ -14,7 +14,7 @@ const connection = { // Service Name: ${PGSQL_PGSS_CONTAINER}_${PGSQL_VERSION}_service // Docker Container Name: ${PGSQL_PGSS_CONTAINER}_${PGSQL_VERSION} -const version = process.env.PGSQL_VERSION ? `${process.env.PGSQL_VERSION}` : '14'; +const version = process.env.PGSQL_VERSION ? `${process.env.PGSQL_VERSION}` : '17'; const container = process.env.PGSQL_PGSS_CONTAINER ? `${process.env.PGSQL_PGSS_CONTAINER}` : 'pgsql_pgss'; const database = `pgss${Math.floor(Math.random() * 99) + 1}`; const pgss_service_name = `${container}_${version}_service`; From 034e8ed8bfdf2c5b7fe5e921224ddd1c649914aa Mon Sep 17 00:00:00 2001 From: yurkovychv Date: Mon, 21 Oct 2024 16:14:55 +0300 Subject: [PATCH 2/2] PMM-7 fix PG dashboard test --- tests/qa-integration/pmm_pgsm_integration_test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qa-integration/pmm_pgsm_integration_test.js b/tests/qa-integration/pmm_pgsm_integration_test.js index 27c322495..13388fb88 100644 --- a/tests/qa-integration/pmm_pgsm_integration_test.js +++ b/tests/qa-integration/pmm_pgsm_integration_test.js @@ -212,7 +212,7 @@ Scenario( adminPage.performPageUp(5); dashboardPage.verifyMetricsExistence(dashboardPage.postgresqlInstanceSummaryDashboard.metrics); await dashboardPage.verifyThereAreNoGraphsWithNA(); - await dashboardPage.verifyThereAreNoGraphsWithoutData(1); + await dashboardPage.verifyThereAreNoGraphsWithoutData(2); }, ); @@ -230,7 +230,7 @@ Scenario( adminPage.performPageUp(5); dashboardPage.verifyMetricsExistence(dashboardPage.postgresqlInstanceSummaryDashboard.metrics); await dashboardPage.verifyThereAreNoGraphsWithNA(); - await dashboardPage.verifyThereAreNoGraphsWithoutData(1); + await dashboardPage.verifyThereAreNoGraphsWithoutData(2); const log = await I.verifyCommand(`docker exec ${container_name} cat pmm-agent.log`); I.assertFalse(