Fix next review issues.

Remove tests `test_datadir_actions` that is part of
`test_container_upgrade.py`. So removed.

For testing settings new_password and new_user
only one function is used.

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

Author: phracek

test/test_container_general.py

@@ -186,39 +186,3 @@ def database_test(self, cip, username, password):
             database=f"db {VARS.SSL_OPTION}",
             sql_cmd="DROP TABLE tbl;",
         )
-
-    @pytest.mark.parametrize(
-        "action",
-        [
-            "",
-            "analyze",
-            "optimize",
-        ],
-    )
-    def test_datadir_actions(self, action):
-        """
-        Test if the datadir works properly with the different actions.
-        Steps are:
-        1. Create a container with the given arguments
-        2. Check if the container is created successfully
-        3. Check if the database connection works
-        """
-        mysql_user = "user"
-        mysql_password = "foo"
-        mysql_database = "db"
-        cid_test = f"test_upgrade_{action}"
-        assert self.db_image.create_container(
-            cid_file_name=cid_test,
-            container_args=[
-                f"-e MYSQL_USER={mysql_user}",
-                f"-e MYSQL_PASSWORD={mysql_password}",
-                f"-e MYSQL_DATABASE={mysql_database}",
-                f"-v {self.datadir}/data:/var/lib/mysql/data:Z",
-            ],
-        )
-        cip, cid = self.db_image.get_cip_cid(cid_file_name=cid_test)
-        assert cip, cid
-        assert self.db_image.test_db_connection(
-            container_ip=cip, username=mysql_user, password=mysql_password
-        )
-        PodmanCLIWrapper.call_podman_command(cmd=f"stop {cid}")

test/test_container_password.py

@@ -42,39 +42,26 @@ def teardown_method(self):
         self.pwd_change.cleanup()
 
     @pytest.mark.parametrize(
-        "username, password, pwd_change",
+        "username, password, pwd_change, user_change, test_dir",
         [
-            ("user", "foo", False),
-            ("user", "bar", True),
+            ("user", "foo", False, False, pwd_dir_change),
+            ("user", "bar", True, False, pwd_dir_change),
+            ("user", "foo", False, False, user_dir_change),
+            ("user2", "bar", False, True, user_dir_change),
         ],
     )
-    def test_password_change(self, username, password, pwd_change):
+    def test_password_and_user_change(
+        self, username, password, pwd_change, user_change, test_dir
+    ):
         """
         Test password change.
         """
 
         self.password_change_test(
             username=username,
             password=password,
-            pwd_dir=pwd_dir_change,
+            pwd_dir=test_dir,
             pwd_change=pwd_change,
-        )
-
-    @pytest.mark.parametrize(
-        "username, password, user_change",
-        [
-            ("user", "foo", False),
-            ("user2", "bar", True),
-        ],
-    )
-    def test_password_change_new_user_test(self, username, password, user_change):
-        """
-        Test user change.
-        """
-        self.password_change_test(
-            username=username,
-            password=password,
-            pwd_dir=user_dir_change,
             user_change=user_change,
         )
 
@@ -92,9 +79,11 @@ def password_change_test(
         1. Create a container with the given arguments
         2. Check if the container is created successfully
         3. Check if the database connection works
-        4. Check if the userchange, then user2 does exist in the database
-        5. Check if the password works
-        6. Check if the password does not work
+        4. If user_change is True, then 'user' and 'foo' are used for testing connection
+        4. Check if the userchange, then user2 does exist in the database logs
+        5. Check if the userchange, then sql command should work with the 'user' and 'bar' should
+        not work and should return an error message
+        6. If pwd_change is True, then 'user' and 'pwdfoo' should not work and should return an error message
         """
         cid_file_name = f"test_{username}_{password}_{user_change}"
 

test/test_container_plugin.py

@@ -38,7 +38,7 @@ def get_cip_cid(self, cid_file_name):
 
     def test_plugin_installation(self):
         """
-        Test plugin installation.
+        Test installs a plugin that stores error messages in a log file and then checks that the plugin works correctly
         """
         cid_file_name = "plugin_install"
         container_args = [

test/test_container_replication.py

@@ -74,7 +74,6 @@ def test_replication(self):
             username="root",
             password="root",
         )
-        slave_found = False
         for _ in range(3):
             result = self.db_wrapper_api.run_sql_command(
                 container_ip=master_cip,
@@ -85,14 +84,11 @@ def test_replication(self):
                 sql_cmd="SHOW SLAVE HOSTS;",
                 podman_run_command="exec",
             )
-            if not result:
-                sleep(3)
-                continue
             if slave_cip in result:
-                slave_found = True
                 break
             sleep(3)
-        assert slave_found
+        else:
+            assert False, "Slave IP not found!"
         assert self.replication_db.test_db_connection(
             container_ip=slave_cip,
             username="root",
@@ -140,11 +136,6 @@ def test_replication(self):
             container_id=VARS.IMAGE_NAME,
             sql_cmd="select * from t1;",
         )
-        # sql_cmd = "select * from t1;"
-        # mysql_cmd = f'mysql -uroot <<< "{sql_cmd}"'
-        # table_output = PodmanCLIWrapper.call_podman_command(
-        #     cmd=f"exec {slave_cid} bash -c '{mysql_cmd}'",
-        # )
         assert re.search(r"^a\n^24", table_output, re.MULTILINE), (
             f"Replica {slave_cip} did not get value from MASTER {master_cip}"
         )

test/test_container_ssl.py

@@ -30,7 +30,9 @@ def teardown_method(self):
 
     def test_ssl(self):
         """
-        Test SSL.
+        Test verify that ssl connections works properly.
+        The SSL certificates are self-signed and used for testing.
+        The tests verifies that Ssl_cipher status is set to a valid value.
         """
         ssl_dir = tempfile.mkdtemp(prefix="/tmp/mysql-ssl_data")
         username = "ssl_test_user"

test/test_container_upgrade.py

@@ -103,7 +103,7 @@ def test_upgrade_test(self, action):
             mysql_user=mysql_user, mysql_password=mysql_password, action="upgrade-auto"
         )
         assert not re.search("Running mysql_upgrade", output), (
-            "mysql_upgrade did not run"
+            "Unexpected mysql_upgrade found"
         )
         output = self.upgrade_db(
             mysql_user=mysql_user, mysql_password=mysql_password, action="upgrade-auto"