MCLOUD-13311: Added health check fix for Integration test & fixed composer test class

prateek-karanpuria-adobe · prateek-karanpuria-adobe · commit 0d2d01ff8005 · 2025-06-25T17:20:47.000+05:30
diff --git a/src/Test/Integration/BuildComposeTest.php b/src/Test/Integration/BuildComposeTest.php
@@ -51,12 +51,12 @@ public function testBuild(string $directory, array $options): void
         );
 
         /** @var MockObject|InputInterface $inputMock */
-        $inputMock = $this->getMockForAbstractClass(InputInterface::class);
+        $inputMock = $this->createMock(InputInterface::class);
 
         $inputMock->method('getOption')
             ->willReturnMap($options);
         /** @var MockObject|OutputInterface $outputMock */
-        $outputMock = $this->getMockForAbstractClass(OutputInterface::class);
+        $outputMock = $this->createMock(OutputInterface::class);
 
         $command->execute($inputMock, $outputMock);
 
diff --git a/src/Test/Integration/_files/cloud_base/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base/docker-compose.exp.yml
@@ -17,7 +17,9 @@ services:
       - 'magento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_developer/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_developer/docker-compose.exp.yml
@@ -17,7 +17,9 @@ services:
       - '.docker/mysql/mariadb.conf.d:/etc/mysql/mariadb.conf.d'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_developer_manual/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_developer_manual/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - 'magento-app:/app'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml
@@ -17,7 +17,9 @@ services:
       - 'magento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_os_2.3_cli/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_os_2.3_cli/docker-compose.exp.yml
@@ -17,7 +17,9 @@ services:
       - 'magento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_os_2_cli/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_os_2_cli/docker-compose.exp.yml
@@ -17,7 +17,9 @@ services:
       - 'magento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_test/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_test/docker-compose.exp.yml
@@ -17,7 +17,9 @@ services:
       - 'mymagento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_image/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_image/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'mymagento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_image_and_version/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_image_and_version/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'mymagento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_version/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_with_custom_zookeeper_version/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'mymagento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_no_tls_service/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_no_tls_service/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_no_varnish_and_tls_service/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_no_varnish_and_tls_service/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/cloud_no_varnish_service/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_no_varnish_service/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/custom_cloud_base_native/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_base_native/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/custom_cloud_custom_images/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_custom_images/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/custom_cloud_no_tls_service/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_no_tls_service/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/custom_cloud_no_varnish_and_tls_services/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_no_varnish_and_tls_services/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/custom_cloud_no_varnish_service/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_no_varnish_service/docker-compose.exp.yml
@@ -15,7 +15,9 @@ services:
       - '.docker/mnt:/mnt:rw,delegated'
       - 'magento-magento-db:/var/lib/mysql'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
diff --git a/src/Test/Integration/_files/custom_registry/docker-compose.exp.yml b/src/Test/Integration/_files/custom_registry/docker-compose.exp.yml
@@ -17,7 +17,9 @@ services:
       - 'magento-magento-db:/var/lib/mysql'
       - '.docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
     healthcheck:
-      test: 'mysqladmin ping -h localhost -pmagento2'
+      test:
+        - CMD-SHELL
+        - 'mariadb-admin ping -h localhost -pmagento2'
       interval: 30s
       timeout: 30s
       retries: 3
