diff --git a/docker/test/testflows/runner/Dockerfile b/docker/test/testflows/runner/Dockerfile index 63e32fad162..3926816bf58 100644 --- a/docker/test/testflows/runner/Dockerfile +++ b/docker/test/testflows/runner/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update \ ENV TZ=Europe/Moscow 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_VERSION 17.09.1-ce diff --git a/tests/testflows/aes_encryption/regression.py b/tests/testflows/aes_encryption/regression.py index e50ac0a3f8b..6c4598dae28 100755 --- a/tests/testflows/aes_encryption/regression.py +++ b/tests/testflows/aes_encryption/regression.py @@ -53,7 +53,7 @@ xfails = { RQ_SRS008_AES_Functions_DifferentModes("1.0") ) @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. """ nodes = { diff --git a/tests/testflows/rbac/helper/common.py b/tests/testflows/rbac/helper/common.py index 1a30e3d22ba..005d0cb373c 100755 --- a/tests/testflows/rbac/helper/common.py +++ b/tests/testflows/rbac/helper/common.py @@ -1,8 +1,10 @@ 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 rbac.helper.tables import table_types @@ -53,7 +55,7 @@ def permutations(table_count=1): return [*range((1 << table_count)-1)] def getuid(): - if "=" in basename(current().name): + if current().subtype == TestSubType.Example: testname = f"{basename(parentname(current().name)).replace(' ', '_').replace(',','')}" else: testname = f"{basename(current().name).replace(' ', '_').replace(',','')}"