thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yandex/ClickHouse

Browse Source
This commit is contained in:
Alexey Milovidov 2018-01-16 23:33:10 +03:00
commit e7adc34aeb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/tests/clickhouse-test
View File

@ -47,11 +47,10 @@ def main(args):
SERVER_DIED = False
def is_data_present():
clickhouse_proc = Popen(shlex.split(args.client), stdin=PIPE, stdout=PIPE, stderr=PIPE)
(stdout, stderr) = clickhouse_proc.communicate("EXISTS TABLE test.hits")
if proc.returncode != 0:
if clickhouse_proc.returncode != 0:
raise CalledProcessError(clickhouse_proc.returncode, args.client, stderr)
return stdout.startswith('1')
@ -342,12 +341,12 @@ if __name__ == '__main__':
if args.queries is None and os.path.isdir('queries'):
args.queries = 'queries'
if args.tmp is None:
args.tmp = args.queries
elif args.queries is None:
args.queries = '/usr/share/clickhouse-test/queries'
if args.tmp is None:
args.tmp = '/tmp/clickhouse-test'
if args.tmp is None:
args.tmp = args.queries
if args.client is None:
args.client = args.binary + '-client'