PMM-7 try fix for remote instances

percona · Nov 15, 2024 · 3433d50 · 3433d50
1 parent 9041232
commit 3433d50
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 36 deletions.
diff --git a/tests/configuration/verifyPMMInventory_test.js b/tests/configuration/verifyPMMInventory_test.js
@@ -347,7 +347,7 @@ Scenario(
     remoteInstancesPage.openAddRemotePage('external');
     const inputs = await remoteInstancesPage.fillRemoteFields(externalExporterServiceName);
 
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(externalExporterServiceName);
     const newLabels = {
       environment: `${inputs.environment} edited` || `${externalExporterServiceName} environment edited`,
@@ -410,7 +410,7 @@ Scenario(
       remoteInstancesHelper.remote_instance.haproxy.haproxy_2.port,
     );
     I.scrollPageToBottom();
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(haproxyServiceName);
     const newLabels = {
       environment: `${remoteInstancesHelper.remote_instance.haproxy.environment} edited` || `${haproxyServiceName} environment edited`,
@@ -474,7 +474,7 @@ Data(azureServices).Scenario(
     remoteInstancesPage.verifyAddInstancePageOpened();
     const inputs = await remoteInstancesPage.fillRemoteRDSFields(serviceName);
 
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(serviceName);
     const newLabels = {
       environment: `${inputs.environment} edited` || `${serviceName} environment edited`,

diff --git a/tests/dashboards/verifyGCRemoteInstance_test.js b/tests/dashboards/verifyGCRemoteInstance_test.js
@@ -69,7 +69,7 @@ Data(instances).Scenario(
     remoteInstancesPage.waitUntilRemoteInstancesPageLoaded();
     remoteInstancesPage.openAddRemotePage(instanceType);
     await remoteInstancesPage.addRemoteDetails(instanceDetails);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(instanceDetails.serviceName);
     await pmmInventoryPage.verifyAgentHasStatusRunning(instanceDetails.serviceName);
     // Waiting for metrics to start hitting PMM-Server

diff --git a/tests/pages/remoteInstancesPage.js b/tests/pages/remoteInstancesPage.js
@@ -527,26 +527,50 @@ module.exports = {
     return pmmInventoryPage;
   },
 
-  clickAddInstanceAndWaitForSuccess() {
+  async clickAddInstanceAndWaitForSuccess() {
     I.waitForVisible(this.fields.addService, 30);
     I.wait(1);
-    I.forceClick(this.fields.addService);
-
-    I.waitForResponse(
-      (response) => {
-        if (response.url().includes('v1/management/services')) {
-          if (response.status() === 200) {
-            return true;
-          }
-
-          throw new Error(`Expected status 200 but received ${response.status()}`);
-        }
-
-        // Continue waiting if this isn't the target request
-        return false;
-      },
-      30,
-    );
+
+    await I.usePlaywrightTo('click Add service and wait for response', async ({ page }) => {
+      const [response] = await Promise.all([
+        page.waitForResponse(
+          async (response) => {
+            if (response.url().includes('v1/management/services')) {
+              if (response.status() === 200) {
+                return true;
+              }
+
+              throw new Error(`Expected status 200 but received ${response.status()}. Response: ${await response.text()}`);
+            }
+
+            return false;
+          },
+          { timeout: 5000 },
+        ),
+        page.click(this.fields.addService),
+      ]);
+    });
+
+    // eslint-disable-next-line no-undef
+    // await retryTo((tryNum) => {
+    //   I.click(this.fields.addService);
+    //
+    //   I.waitForResponse(
+    //     (response) => {
+    //       if (response.url().includes('v1/management/services')) {
+    //         if (response.status() === 200) {
+    //           return true;
+    //         }
+    //
+    //         throw new Error(`Expected status 200 but received ${response.status()}`);
+    //       }
+    //
+    //       // Continue waiting if this isn't the target request
+    //       return false;
+    //     },
+    //     5,
+    //   );
+    // }, 5);
   },
 
   openAddAzure() {

diff --git a/tests/qa-integration/pmm_ps_integration_test.js b/tests/qa-integration/pmm_ps_integration_test.js
@@ -47,7 +47,7 @@ Scenario(
     I.fillField(remoteInstancesPage.fields.password, details.password);
     I.fillField(remoteInstancesPage.fields.environment, details.environment);
     I.fillField(remoteInstancesPage.fields.cluster, details.cluster);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     // I.waitForVisible(pmmInventoryPage.fields.agentsLink, 30);
     I.wait(10);
     await inventoryAPI.verifyServiceExistsAndHasRunningStatus(

diff --git a/tests/qa-integration/pmm_psmdb_integration_test.js b/tests/qa-integration/pmm_psmdb_integration_test.js
@@ -48,7 +48,7 @@ Scenario(
     I.fillField(remoteInstancesPage.fields.environment, details.environment);
     I.fillField(remoteInstancesPage.fields.cluster, details.cluster);
     I.click(remoteInstancesPage.fields.useQANMongoDBProfiler);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     I.waitForVisible(pmmInventoryPage.fields.agentsLink, 30);
     await inventoryAPI.verifyServiceExistsAndHasRunningStatus(
       {

diff --git a/tests/qa-integration/pmm_pxc_integration_test.js b/tests/qa-integration/pmm_pxc_integration_test.js
@@ -47,7 +47,7 @@ Scenario(
     I.fillField(remoteInstancesPage.fields.password, details.password);
     I.fillField(remoteInstancesPage.fields.environment, details.environment);
     I.fillField(remoteInstancesPage.fields.cluster, details.cluster);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     // I.waitForVisible(pmmInventoryPage.fields.agentsLink, 30);
     await inventoryAPI.verifyServiceExistsAndHasRunningStatus(
       {

diff --git a/tests/verifyAzureMySQLPostgreSQLRemoteInstance_test.js b/tests/verifyAzureMySQLPostgreSQLRemoteInstance_test.js
@@ -43,7 +43,7 @@ Data(azureServices).Scenario(
     remoteInstancesPage.startMonitoringOfInstance(current.instanceToMonitor);
     remoteInstancesPage.verifyAddInstancePageOpened();
     await remoteInstancesPage.fillRemoteRDSFields(serviceName);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(serviceName);
 
     if (serviceName === 'azure-MySQL') {

diff --git a/tests/verifyRemoteInstances_test.js b/tests/verifyRemoteInstances_test.js
@@ -75,7 +75,7 @@ Scenario(
     remoteInstancesPage.waitUntilRemoteInstancesPageLoaded();
     remoteInstancesPage.openAddRemotePage('external');
     await remoteInstancesPage.fillRemoteFields(externalExporterServiceName);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(externalExporterServiceName);
     await I.click(pmmInventoryPage.fields.showServiceDetails(externalExporterServiceName));
     await I.click(pmmInventoryPage.fields.agentsLinkNew);
@@ -205,7 +205,7 @@ Scenario(
       remoteInstancesHelper.remote_instance.haproxy.haproxy_2.port,
     );
     I.scrollPageToBottom();
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(haproxyServiceName);
 
     await I.click(pmmInventoryPage.fields.showServiceDetails(haproxyServiceName));
@@ -258,7 +258,7 @@ Data(remotePostgreSQL).Scenario(
     I.waitForVisible(remoteInstancesPage.fields.skipTLSL, 30);
     I.click(remoteInstancesPage.fields.skipTLSL);
     I.click(current.trackingOption);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(current.instanceName);
     await pmmInventoryPage.verifyAgentHasStatusRunning(current.instanceName);
     await pmmInventoryPage.checkExistingAgent(current.checkAgent);
@@ -334,7 +334,7 @@ Scenario(
     I.click(remoteInstancesPage.fields.addService);
     I.verifyPopUpMessage(errorMessage);
     I.fillField(remoteInstancesPage.fields.database, 'not_default_db');
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(remoteServiceName);
     await pmmInventoryPage.verifyAgentHasStatusRunning(remoteServiceName);
     // verify metric for client container node instance

diff --git a/tests/verifyTLSMongoDBRemoteInstance_test.js b/tests/verifyTLSMongoDBRemoteInstance_test.js
@@ -53,7 +53,7 @@ Data(instances).Scenario(
     remoteInstancesPage.waitUntilRemoteInstancesPageLoaded();
     remoteInstancesPage.openAddRemotePage(serviceType);
     await remoteInstancesPage.addRemoteSSLDetails(details);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     await inventoryAPI.verifyServiceExistsAndHasRunningStatus(
       {
         serviceType: SERVICE_TYPE.MONGODB,
@@ -221,7 +221,7 @@ Data(instances).Scenario(
     remoteInstancesPage.openAddRemotePage(serviceType);
     await remoteInstancesPage.addRemoteSSLDetails(details);
     I.fillField(remoteInstancesPage.fields.maxQueryLength, maxQueryLength);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
 
     // Check Remote Instance also added and have running status
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(remoteServiceName);

diff --git a/tests/verifyTLSMySQLRemoteInstance_test.js b/tests/verifyTLSMySQLRemoteInstance_test.js
@@ -69,7 +69,7 @@ Data(instances).Scenario(
     remoteInstancesPage.waitUntilRemoteInstancesPageLoaded();
     remoteInstancesPage.openAddRemotePage(serviceType);
     await remoteInstancesPage.addRemoteSSLDetails(details);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     // Add wait for service status to be updated
     I.wait(10);
     await inventoryAPI.verifyServiceExistsAndHasRunningStatus(
@@ -244,7 +244,7 @@ Data(maxQueryLengthInstances).Scenario(
     remoteInstancesPage.openAddRemotePage(serviceType);
     await remoteInstancesPage.addRemoteSSLDetails(details);
     I.fillField(remoteInstancesPage.fields.maxQueryLength, maxQueryLength);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
 
     // Check Remote Instance also added and have running status
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(remoteServiceName);

diff --git a/tests/verifyTLSPostgresRemoteInstance_test.js b/tests/verifyTLSPostgresRemoteInstance_test.js
@@ -48,7 +48,7 @@ Data(instances).Scenario(
     remoteInstancesPage.waitUntilRemoteInstancesPageLoaded();
     remoteInstancesPage.openAddRemotePage(serviceType);
     await remoteInstancesPage.addRemoteSSLDetails(details);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
     await inventoryAPI.verifyServiceExistsAndHasRunningStatus(
       {
         serviceType: SERVICE_TYPE.POSTGRESQL,
@@ -225,7 +225,7 @@ Data(instances).Scenario(
     remoteInstancesPage.openAddRemotePage(serviceType);
     await remoteInstancesPage.addRemoteSSLDetails(details);
     I.fillField(remoteInstancesPage.fields.maxQueryLength, maxQueryLength);
-    remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
+    await remoteInstancesPage.clickAddInstanceAndWaitForSuccess();
 
     // Check Remote Instance also added and have running status
     pmmInventoryPage.verifyRemoteServiceIsDisplayed(remoteServiceName);