From 147fa9fed92c6b35061091971590e3243522bb84 Mon Sep 17 00:00:00 2001 From: Val Date: Sat, 4 Jul 2020 16:39:17 +0300 Subject: [PATCH] fix type error in zookeeper --- src/Common/ZooKeeper/ZooKeeper.cpp | 2 +- tests/integration/runner | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp index 541625149dd..e09533874e3 100644 --- a/src/Common/ZooKeeper/ZooKeeper.cpp +++ b/src/Common/ZooKeeper/ZooKeeper.cpp @@ -582,7 +582,7 @@ void ZooKeeper::removeChildren(const std::string & path) void ZooKeeper::tryRemoveChildren(const std::string & path) { Strings children; - if (tryGetChildren(path, children) != Coordination::ZOK) + if (tryGetChildren(path, children) != Coordination::Error::ZOK) return; while (!children.empty()) { diff --git a/tests/integration/runner b/tests/integration/runner index 058badcee66..399c87dcf06 100755 --- a/tests/integration/runner +++ b/tests/integration/runner @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python #-*- coding: utf-8 -*- import subprocess import os @@ -105,7 +105,7 @@ if __name__ == "__main__": bridge_bin=args.bridge_binary, cfg=args.configs_dir, pth=args.clickhouse_root, - opts='-vv ' + ' '.join(args.pytest_args), + opts=' '.join(args.pytest_args), img=DIND_INTEGRATION_TESTS_IMAGE_NAME, name=CONTAINER_NAME, command=args.command