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

Fix wrong code in clickhouse-test

Browse Source
This commit is contained in:
alesapin 2019-01-24 14:02:55 +03:00
parent f13d094a4e
commit a8524b6e36
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dbms/tests/clickhouse-test
View File

@ -328,6 +328,14 @@ def main(args):
print(colored("\n{passed_total} tests passed. {skipped_total} tests skipped.".format(passed_total = passed_total, skipped_total = skipped_total), "green", attrs=["bold"]))
sys.exit(0)
def find_binary(name):
paths = os.environ.get("PATH").split(':')
for path in paths:
if os.access(os.path.join(path, name), os.X_OK):
return True
# maybe it wasn't in PATH
return os.access(os.path.join('/usr/bin', name), os.X_OK)
if __name__ == '__main__':
parser = ArgumentParser(description = 'ClickHouse functional tests')
@ -370,14 +378,15 @@ if __name__ == '__main__':
if args.tmp is None:
args.tmp = args.queries
if args.client is None:
if os.access(args.binary + '-client', os.X_OK):
if find_binary(args.binary + '-client'):
args.client = args.binary + '-client'
elif os.access(args.binary,os.X_OK):
elif find_binary(args.binary):
args.client = args.binary + ' client'
else:
print("No clickhouse binary found")
parser.print_help();
exit(0);
print("No 'clickhouse' binary found in PATH")
parser.print_help()
exit(1)
if args.configclient:
args.client += ' --config-file=' + args.configclient
if os.getenv("CLICKHOUSE_HOST"):