Fixing PXC Docker job (#528)

Percona-QA · Aug 31, 2023 · 3c22c53 · 3c22c53
1 parent 6b53975
commit 3c22c53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docker-image-tests/pxc/tests/test_pxc_debug.py b/docker-image-tests/pxc/tests/test_pxc_debug.py
@@ -21,7 +21,6 @@ def host():
     yield testinfra.get_host("docker://root@" + docker_id)
     subprocess.check_call(['docker', 'rm', '-f', docker_id])
 
-@pytest.mark.skipif(docker_acc == "perconalab", reason="Skipping tests in 'testing' repo")
 class TestMysqlEnvironment:
     @pytest.mark.parametrize("pkg_name,pkg_version", pxc_packages)
     def test_packages(self, host, pkg_name, pkg_version):
@@ -38,6 +37,6 @@ def test_mysql_version(self, host):
     @pytest.mark.skipif(docker_acc == "perconalab", reason="Skipping tests in 'testing' repo")
     def test_mysqld_version(self, host):
         if pxc_version_major in ['5.7','5.6']:
-            assert host.check_output('mysqld --version') == 'mysqld  Ver '+pxc57_server_version_norel+' for Linux on x86_64 (Percona XtraDB Cluster (GPL), Release '+pxc57_server_release+', Revision '+pxc_revision+', WSREP version '+ pxc_wsrep_version +', wsrep_'+ pxc_wsrep_version +')'
+            assert host.check_output('mysqld --version') == '/usr/sbin/mysqld-ps  Ver '+pxc57_server_version_norel+' for Linux on x86_64 (Percona XtraDB Cluster (GPL), Release '+pxc57_server_release+', Revision '+pxc_revision+', WSREP version '+ pxc_wsrep_version +', wsrep_'+ pxc_wsrep_version +')'
         else:
             assert host.check_output('mysqld --version') == '/usr/sbin/mysqld-ps  Ver '+ pxc_version +' for Linux on x86_64 (Percona XtraDB Cluster (GPL), Release rel'+ pxc_rel +', Revision '+ pxc_revision +', WSREP version '+ pxc_wsrep_version +')'
diff --git a/docker-image-tests/pxc/tests/test_pxc_latest.py b/docker-image-tests/pxc/tests/test_pxc_latest.py
@@ -21,6 +21,7 @@ def host():
     yield testinfra.get_host("docker://root@" + docker_id)
     subprocess.check_call(['docker', 'rm', '-f', docker_id])
 
+@pytest.mark.skipif(pxc_version_major == "5.7", reason="Skipping tests for 5.7")
 @pytest.mark.skipif(docker_acc == "perconalab", reason="Skipping tests in 'testing' repo")
 class TestMysqlEnvironment:
     @pytest.mark.parametrize("pkg_name,pkg_version", pxc_packages)