From 087474ba3d7de5117430b85d93fe4fbe81fa01fc Mon Sep 17 00:00:00 2001 From: proller Date: Tue, 16 Jan 2018 23:17:31 +0300 Subject: [PATCH] Fix tests --- dbms/tests/clickhouse-test | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dbms/tests/clickhouse-test b/dbms/tests/clickhouse-test index 8170514d661..75eec3ce913 100755 --- a/dbms/tests/clickhouse-test +++ b/dbms/tests/clickhouse-test @@ -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'