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

small fixes

Browse Source
This commit is contained in:
MyroTk 2020-10-24 00:59:38 +02:00
parent 0da6e855c0
commit d42a049d9d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/test/testflows/runner/Dockerfile
View File

@ -35,7 +35,7 @@ RUN apt-get update \
ENV TZ=Europe/Moscow ENV TZ=Europe/Moscow
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN pip3 install urllib3 testflows==1.6.58 docker-compose docker dicttoxml kazoo tzlocal RUN pip3 install urllib3 testflows==1.6.57 docker-compose docker dicttoxml kazoo tzlocal
ENV DOCKER_CHANNEL stable ENV DOCKER_CHANNEL stable
ENV DOCKER_VERSION 17.09.1-ce ENV DOCKER_VERSION 17.09.1-ce

2
tests/testflows/aes_encryption/regression.py
View File

@ -53,7 +53,7 @@ xfails = {
RQ_SRS008_AES_Functions_DifferentModes("1.0") RQ_SRS008_AES_Functions_DifferentModes("1.0")
) )
@XFails(xfails) @XFails(xfails)
def regression(self, local, clickhouse_binary_path): def regression(self, local, clickhouse_binary_path, stress=None, parallel=None):
"""ClickHouse AES encryption functions regression module. """ClickHouse AES encryption functions regression module.
""" """
nodes = { nodes = {

10
tests/testflows/rbac/helper/common.py
View File

@ -1,8 +1,10 @@
import uuid import uuid
from multiprocessing.dummy import Pool
from testflows.core.name import basename, parentname
from contextlib import contextmanager
from contextlib import contextmanager
from multiprocessing.dummy import Pool
from testflows.core.name import basename, parentname
from testflows._core.testtype import TestSubType
from testflows.core import * from testflows.core import *
from rbac.helper.tables import table_types from rbac.helper.tables import table_types
@ -53,7 +55,7 @@ def permutations(table_count=1):
return [*range((1 << table_count)-1)] return [*range((1 << table_count)-1)]
def getuid(): def getuid():
if "=" in basename(current().name): if current().subtype == TestSubType.Example:
testname = f"{basename(parentname(current().name)).replace(' ', '_').replace(',','')}" testname = f"{basename(parentname(current().name)).replace(' ', '_').replace(',','')}"
else: else:
testname = f"{basename(current().name).replace(' ', '_').replace(',','')}" testname = f"{basename(current().name).replace(' ', '_').replace(',','')}"