Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PMM-7 fix PG versions #876

Merged
merged 2 commits into from
Oct 28, 2024
Merged

PMM-7 fix PG versions #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2148f8a
PMM-7 fix PG versions
yurkovychv Oct 21, 2024
034e8ed
PMM-7 fix PG dashboard test
yurkovychv Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions tests/qa-integration/pmm_pgsm_integration_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
Expand Down Expand Up @@ -212,7 +212,7 @@ Scenario(
adminPage.performPageUp(5);
dashboardPage.verifyMetricsExistence(dashboardPage.postgresqlInstanceSummaryDashboard.metrics);
await dashboardPage.verifyThereAreNoGraphsWithNA();
await dashboardPage.verifyThereAreNoGraphsWithoutData(1);
await dashboardPage.verifyThereAreNoGraphsWithoutData(2);
},
);

Expand All @@ -230,11 +230,13 @@ 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(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',
);
},
);

Expand Down
2 changes: 1 addition & 1 deletion tests/qa-integration/pmm_pgss_integration_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
Expand Down
Loading