thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-13 11:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Reverting changes to clickhouse-test as it seems to cause some tests to fail

Browse Source 
* Updating client.py to use CLICKHOUSE_BINARY env variable instead of CLICKHOUSE_CLIENT
This commit is contained in:
Vitaliy Zakaznikov 2019-06-13 21:02:15 -04:00
parent 117f2d191e
commit 6cca6d359d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/tests/clickhouse-test
View File

@ -258,7 +258,7 @@ def main(args):
# Keep same default values as in queries/shell_config.sh # Keep same default values as in queries/shell_config.sh
os.environ.setdefault("CLICKHOUSE_BINARY", args.binary) os.environ.setdefault("CLICKHOUSE_BINARY", args.binary)
os.environ.setdefault("CLICKHOUSE_CLIENT", args.client) #os.environ.setdefault("CLICKHOUSE_CLIENT", args.client)
os.environ.setdefault("CLICKHOUSE_CONFIG", args.configserver) os.environ.setdefault("CLICKHOUSE_CONFIG", args.configserver)
if args.configclient: if args.configclient:
os.environ.setdefault("CLICKHOUSE_CONFIG_CLIENT", args.configclient) os.environ.setdefault("CLICKHOUSE_CONFIG_CLIENT", args.configclient)

2
dbms/tests/queries/0_stateless/helpers/client.py
View File

@ -12,7 +12,7 @@ end_of_block = r'.*\r\n.*\r\n'
def client(command=None, name='', log=None): def client(command=None, name='', log=None):
if command is None: if command is None:
client = uexpect.spawn(os.environ.get('CLICKHOUSE_CLIENT')) client = uexpect.spawn(os.environ.get('CLICKHOUSE_BINARY', 'clickhouse') + '-client')
else: else:
client = uexpect.spawn(command) client = uexpect.spawn(command)
client.eol('\r') client.eol('\r')