thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mysql client tests to use mysql8 image

Browse Source 
#ci_set_integration
 #ci_set_arm
This commit is contained in:
Max Kainov 2024-03-20 17:23:08 +00:00
parent 55737de0e6
commit 9f3c625ab5
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/compose/docker_compose_mysql_client.yml
View File

@ -1,7 +1,7 @@
version: '2.3'
services:
mysql_client:
image: mysql:5.7
image: mysql:8.0
restart: always
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: 1

1
tests/integration/test_endpoint_macro_substitution/test.py
View File

@ -13,6 +13,7 @@ disk_types = {
if is_arm():
pytestmark = pytest.mark.skip
@pytest.fixture(scope="module")
def cluster():
try:

7
tests/integration/test_kerberos_auth/test.py
View File

@ -1,6 +1,10 @@
import pytest
from helpers.cluster import ClickHouseCluster, is_arm
if is_arm():
pytestmark = pytest.mark.skip
cluster = ClickHouseCluster(__file__)
instance1 = cluster.add_instance(
"instance1",
@ -62,12 +66,10 @@ def make_auth(instance):
)
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_kerberos_auth_with_keytab(kerberos_cluster):
assert make_auth(instance1) == "kuser\n"
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_kerberos_auth_without_keytab(kerberos_cluster):
assert (
"DB::Exception: : Authentication failed: password is incorrect, or there is no user with such name."
@ -75,7 +77,6 @@ def test_kerberos_auth_without_keytab(kerberos_cluster):
)
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_bad_path_to_keytab(kerberos_cluster):
assert (
"DB::Exception: : Authentication failed: password is incorrect, or there is no user with such name."

4
tests/integration/test_mysql_protocol/test.py
View File

@ -15,16 +15,12 @@ import pytest
from helpers.cluster import (
ClickHouseCluster,
get_docker_compose_path,
is_arm,
run_and_check,
)
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
DOCKER_COMPOSE_PATH = get_docker_compose_path()
if is_arm():
pytestmark = pytest.mark.skip
cluster = ClickHouseCluster(__file__)
node = cluster.add_instance(

10
tests/integration/test_storage_kerberized_hdfs/test.py
View File

@ -6,6 +6,9 @@ import os
from helpers.cluster import ClickHouseCluster, is_arm
import subprocess
if is_arm():
pytestmark = pytest.mark.skip
cluster = ClickHouseCluster(__file__)
node1 = cluster.add_instance(
"node1",
@ -29,7 +32,6 @@ def started_cluster():
cluster.shutdown()
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_read_table(started_cluster):
hdfs_api = started_cluster.hdfs_api
@ -45,7 +47,6 @@ def test_read_table(started_cluster):
assert select_read == data
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_read_write_storage(started_cluster):
hdfs_api = started_cluster.hdfs_api
@ -61,7 +62,6 @@ def test_read_write_storage(started_cluster):
assert select_read == "1\tMark\t72.53\n"
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_write_storage_not_expired(started_cluster):
hdfs_api = started_cluster.hdfs_api
@ -79,7 +79,6 @@ def test_write_storage_not_expired(started_cluster):
assert select_read == "1\tMark\t72.53\n"
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_two_users(started_cluster):
hdfs_api = started_cluster.hdfs_api
@ -102,7 +101,6 @@ def test_two_users(started_cluster):
)
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_read_table_expired(started_cluster):
hdfs_api = started_cluster.hdfs_api
@ -123,7 +121,6 @@ def test_read_table_expired(started_cluster):
started_cluster.unpause_container("hdfskerberos")
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_prohibited(started_cluster):
node1.query(
"create table HDFSStorTwoProhibited (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://suser@kerberizedhdfs1:9010/storage_user_two_prohibited', 'TSV')"
@ -138,7 +135,6 @@ def test_prohibited(started_cluster):
)
@pytest.mark.skipif(is_arm(), reason="skip for ARM")
def test_cache_path(started_cluster):
node1.query(
"create table HDFSStorCachePath (id UInt32, name String, weight Float64) ENGINE = HDFS('hdfs://dedicatedcachepath@kerberizedhdfs1:9010/storage_dedicated_cache_path', 'TSV')"