diff options
| author | Anton Yuzhaninov <citrin+github@citrin.ru> | 2019-06-20 18:27:12 +0100 |
|---|---|---|
| committer | Anton Yuzhaninov <citrin+github@citrin.ru> | 2019-06-20 18:27:12 +0100 |
| commit | bf20478dd5e5dfd80cdcbe0bed7242b008fa518b (patch) | |
| tree | 97f9dfed5d56926c722911c714b4633566352dee /test/functional/cases | |
| parent | 522de496b116e44bcddfa3c43de91f8bae20521c (diff) | |
| download | rspamd-bf20478dd5e5dfd80cdcbe0bed7242b008fa518b.tar.gz rspamd-bf20478dd5e5dfd80cdcbe0bed7242b008fa518b.zip | |
[Minor] Fix ClickHouse test after upgrade
Current ClickHouse version refuses to run from root if data directory is
not owned by root. Run it from user clickhouse as it supposed to be run.
Also cleanup ClickHouse config (some options prevented it to start,
others just unnecessary).
Diffstat (limited to 'test/functional/cases')
| -rw-r--r-- | test/functional/cases/210_clickhouse/001_migration.robot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/cases/210_clickhouse/001_migration.robot b/test/functional/cases/210_clickhouse/001_migration.robot index d1b357415..9ee526c6c 100644 --- a/test/functional/cases/210_clickhouse/001_migration.robot +++ b/test/functional/cases/210_clickhouse/001_migration.robot @@ -63,10 +63,10 @@ Clickhouse Setup ${config} = Replace Variables ${template} Create File ${TMPDIR}/clickhouse-config.xml ${config} Copy File ${TESTDIR}/configs/clickhouse-users.xml ${TMPDIR}/users.xml - Create Directory ${TMPDIR}/metadata - Create Directory ${TMPDIR}/metadata/default - Create Directory ${TMPDIR}/data/default - ${result} = Run Process clickhouse-server --daemon --config-file\=${TMPDIR}/clickhouse-config.xml --pid-file\=${TMPDIR}/clickhouse.pid + Create Directory ${TMPDIR}/clickhouse + Set Directory Ownership ${TMPDIR}/clickhouse clickhouse clickhouse + ${result} = Run Process + ... su -s /bin/sh clickhouse -c clickhouse-server --daemon --config-file\=${TMPDIR}/clickhouse-config.xml --pid-file\=${TMPDIR}/clickhouse/clickhouse.pid Run Keyword If ${result.rc} != 0 Log ${result.stderr} Should Be Equal As Integers ${result.rc} 0 Wait Until Keyword Succeeds 5 sec 50 ms TCP Connect localhost ${CLICKHOUSE_PORT} @@ -76,7 +76,7 @@ Clickhouse Setup Clickhosue Teardown # Sleep 30 - ${clickhouse_pid} = Get File ${TMPDIR}/clickhouse.pid + ${clickhouse_pid} = Get File ${TMPDIR}/clickhouse/clickhouse.pid Shutdown Process With Children ${clickhouse_pid} Simple Teardown |