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

move docker-compose files

Browse Source
This commit is contained in:
Alexander Tokmakov 2020-08-27 14:42:53 +03:00
parent 7943c5c73c
commit 65a69ff6ad
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/integration/test_materialize_mysql_database/composes/mysql_5_7_compose.yml → docker/test/integration/runner/compose/docker_compose_mysql_5_7.yml
View File

0
tests/integration/test_materialize_mysql_database/composes/mysql_8_0_compose.yml → docker/test/integration/runner/compose/docker_compose_mysql_8_0.yml
View File

8
tests/integration/test_materialize_mysql_database/test.py
View File

@ -6,9 +6,9 @@ import pymysql.cursors
import pytest
import materialize_with_ddl
from helpers.cluster import ClickHouseCluster
from helpers.cluster import ClickHouseCluster, get_docker_compose_path
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
DOCKER_COMPOSE_PATH = get_docker_compose_path()
cluster = ClickHouseCluster(__file__)
clickhouse_node = cluster.add_instance('node1', config_dir="configs", with_mysql=False)
@ -62,7 +62,7 @@ class MySQLNodeInstance:
@pytest.fixture(scope="module")
def started_mysql_5_7():
mysql_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 33307)
docker_compose = os.path.join(SCRIPT_DIR, 'composes', 'mysql_5_7_compose.yml')
docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_5_7.yml')
try:
subprocess.check_call(['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d'])
@ -76,7 +76,7 @@ def started_mysql_5_7():
@pytest.fixture(scope="module")
def started_mysql_8_0():
mysql_node = MySQLNodeInstance('root', 'clickhouse', '127.0.0.1', 33308)
docker_compose = os.path.join(SCRIPT_DIR, 'composes', 'mysql_8_0_compose.yml')
docker_compose = os.path.join(DOCKER_COMPOSE_PATH, 'docker_compose_mysql_8_0.yml')
try:
subprocess.check_call(['docker-compose', '-p', cluster.project_name, '-f', docker_compose, 'up', '--no-recreate', '-d'])