Update tests suite based on the review

done by @frenzymadness

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

test/test_container_basics.py

@@ -85,35 +85,34 @@ def test_connection_with_mount(self):
         2. Create a container with the mounted directory
         3. Test if the database connection works with the operations user
         """
-        data_dir = tempfile.mkdtemp(prefix="/tmp/mysql-test_data")
-        shutil.copytree(VARS.TEST_APP, f"{data_dir}/test-app")
-        assert ContainerTestLibUtils.commands_to_run(
-            commands_to_run=[
-                f"chown -R 27:27 {data_dir}/test-app",
-            ]
-        )
-        cid_with_mount = "connection_with_mount"
-        operation_user = "operations_user"
-        operation_pass = "operations_pass"
+        with tempfile.TemporaryDirectory(prefix="/tmp/mysql-test_data") as data_dir:
+            shutil.copytree(VARS.TEST_APP, f"{data_dir}/test-app")
+            assert ContainerTestLibUtils.commands_to_run(
+                commands_to_run=[
+                    f"chown -R 27:27 {data_dir}/test-app",
+                ]
+            )
+            cid_with_mount = "connection_with_mount"
+            operation_user = "operations_user"
+            operation_pass = "operations_pass"
 
-        self.app_image.create_container(
-            cid_file_name=cid_with_mount,
-            container_args=[
-                "-e MYSQL_USER=config_test_user",
-                "-e MYSQL_PASSWORD=config_test_user",
-                "-e MYSQL_DATABASE=db",
-                f"-e MYSQL_OPERATIONS_USER={operation_user}",
-                f"-e MYSQL_OPERATIONS_PASSWORD={operation_pass}",
-                f"-v {data_dir}/test-app:/opt/app-root/src/:z",
-            ],
-        )
-        cip, cid = self.app_image.get_cip_cid(cid_file_name=cid_with_mount)
-        assert cip and cid
-        assert self.app_image.test_db_connection(
-            container_ip=cip,
-            username=operation_user,
-            password=operation_pass,
-            max_attempts=10,
-        )
-        PodmanCLIWrapper.call_podman_command(cmd=f"stop {cid}")
-        shutil.rmtree(data_dir)
+            self.app_image.create_container(
+                cid_file_name=cid_with_mount,
+                container_args=[
+                    "-e MYSQL_USER=config_test_user",
+                    "-e MYSQL_PASSWORD=config_test_user",
+                    "-e MYSQL_DATABASE=db",
+                    f"-e MYSQL_OPERATIONS_USER={operation_user}",
+                    f"-e MYSQL_OPERATIONS_PASSWORD={operation_pass}",
+                    f"-v {data_dir}/test-app:/opt/app-root/src/:z",
+                ],
+            )
+            cip, cid = self.app_image.get_cip_cid(cid_file_name=cid_with_mount)
+            assert cip and cid
+            assert self.app_image.test_db_connection(
+                container_ip=cip,
+                username=operation_user,
+                password=operation_pass,
+                max_attempts=10,
+            )
+            PodmanCLIWrapper.call_podman_command(cmd=f"stop {cid}")

test/test_container_configuration.py

@@ -35,25 +35,11 @@ def test_container_creation_fails(self):
             cid_file_name=cid_config_test, container_args=[], command=""
         )
 
-    @pytest.mark.parametrize(
-        "container_args",
-        [
-            ["-e MYSQL_USER=user", "-e MYSQL_DATABASE=db"],
-            ["-e MYSQL_PASSWORD=pass", "-e MYSQL_DATABASE=db"],
-        ],
-    )
-    def test_try_image_invalid_combinations(self, container_args):
-        """
-        Test container creation fails with invalid combinations of arguments.
-        """
-        cid_file_name = "try_image_invalid_combinations"
-        assert self.db.assert_container_creation_fails(
-            cid_file_name=cid_file_name, container_args=container_args, command=""
-        )
-
     @pytest.mark.parametrize(
         "mysql_user, mysql_password, mysql_database, mysql_root_password",
         [
+            ["user", "", "db", ""],
+            ["", "pass", "db", ""],
             ["user", "pass", "", ""],
             [
                 "$invalid",
@@ -196,7 +182,8 @@ def test_configuration_auto_calculated_settings(self):
             assert re.search(value, db_configuration), (
                 f"Expected value {value} not found in {db_configuration}"
             )
-        # do some real work to test replication in practice
+        # Create table and show its configuration to verify
+        # charset and collation settings
         self.db_api.run_sql_command(
             container_ip=cip,
             username=username,

test/test_container_general.py

@@ -67,7 +67,7 @@ def test_run(self, docker_args, username, password, root_password):
             command="run-mysqld --innodb_buffer_pool_size=5242880",
         )
         cip, cid = self.db_image.get_cip_cid(cid_file_name=cid_file_name)
-        assert cip, cid
+        assert cip and cid
         assert self.db_image.test_db_connection(
             container_ip=cip, username=username, password=password
         )
@@ -112,7 +112,6 @@ def test_run(self, docker_args, username, password, root_password):
                         f"Root login access failed for {user}:{pwd} with expected success {ret_value}"
                     )
                     root_login_access = False
-                    continue
             assert root_login_access
         assert self.db_image.db_lib.assert_local_access(container_id=cid)
         self.database_test(cip, username, password)
@@ -165,7 +164,13 @@ def database_test(self, cip, username, password):
 
     def test_datadir_actions(self):
         """
-        Test container creation fails with invalid combinations of arguments.
+        Test container with specific data directory actions.
+        Steps are:
+        1. Create a container with a mounted data directory and check the connection.
+        2. Create a container with MYSQL_DATADIR_ACTION=analyze and
+            check the logs for the analyze command.
+        3. Create a container with MYSQL_DATADIR_ACTION=optimize and
+            check the logs for the optimize command.
         """
         cid_testupg1 = "testupg1"
         datadir = tempfile.mkdtemp(prefix="/tmp/mysql-datadir-actions")
@@ -206,7 +211,7 @@ def test_datadir_actions(self):
             ],
         )
         cip, cid = self.db_image.get_cip_cid(cid_file_name=cid_testupg5)
-        assert cip, cid
+        assert cip and cid
         assert self.db_image.test_db_connection(
             container_ip=cip, username=mysql_user, password=mysql_password
         )
@@ -228,7 +233,7 @@ def test_datadir_actions(self):
             ],
         )
         cip, cid = self.db_image.get_cip_cid(cid_file_name=cid_testupg6)
-        assert cip, cid
+        assert cip and cid
         assert self.db_image.test_db_connection(
             container_ip=cip, username=mysql_user, password=mysql_password
         )

test/test_container_password.py

@@ -93,7 +93,7 @@ def password_change_test(
             container_args=container_args,
         )
         cip, cid = self.pwd_change.get_cip_cid(cid_file_name=cid_file_name)
-        assert cip, cid
+        assert cip and cid
         if user_change:
             username = "user"
             password = "foo"

test/test_container_replication.py

@@ -47,9 +47,8 @@ def test_replication(self):
             docker_args=cluster_args,
             command="run-mysqld-source",
         )
-        source_cip = self.replication_db.get_cip(cid_file_name=source_cid)
-        source_cid = self.replication_db.get_cid(cid_file_name=source_cid)
-        assert source_cid
+        source_cip, source_cid = self.replication_db.get_cip_cid(cid_file_name=source_cid)
+        assert source_cip and source_cid
         # Run the MySQL replica
         replica_cid = "replica.cid"
         assert self.replication_db.create_container(
@@ -61,10 +60,8 @@ def test_replication(self):
             docker_args=cluster_args,
             command="run-mysqld-replica",
         )
-        replica_cip = self.replication_db.get_cip(cid_file_name=replica_cid)
-        assert replica_cip
-        replica_cid = self.replication_db.get_cid(cid_file_name=replica_cid)
-        assert replica_cid
+        replica_cip, replica_cid = self.replication_db.get_cip_cid(cid_file_name=replica_cid)
+        assert replica_cip and replica_cid
         # Now wait till the SOURCE will see the REPLICA
         result = self.replication_db.test_db_connection(
             container_ip=replica_cip,

test/test_container_ssl.py

@@ -75,13 +75,11 @@ def test_ssl(self):
                 f"-v {ssl_dir}:/opt/app-root/src/:z",
             ],
         )
-        cip = self.ssl_db.get_cip(cid_file_name=cid_file_name)
-        assert cip
+        cip, cid = self.ssl_db.get_cip_cid(cid_file_name=cid_file_name)
+        assert cip and cid
         assert self.ssl_db.test_db_connection(
             container_ip=cip, username=username, password=password
         )
-        cid = self.ssl_db.get_cid(cid_file_name=cid_file_name)
-        assert cid
 
         mysql_cmd = (
             f"mysql --host {cip} -u{username} -p{password} --ssl-ca={ca_cert_path}"