diff options
| author | Anton Yuzhaninov <citrin+git@citrin.ru> | 2018-10-24 18:46:11 -0400 |
|---|---|---|
| committer | Anton Yuzhaninov <citrin+git@citrin.ru> | 2018-10-24 19:23:46 -0400 |
| commit | 701419544ded2fe5c07dd5f614e4edce65d1cc28 (patch) | |
| tree | e3c50759ee7e25051077abe5ef303f78e5f9abfe | |
| parent | 3fbcbfe4605d78e27e083ce708258fda796424eb (diff) | |
| download | rspamd-701419544ded2fe5c07dd5f614e4edce65d1cc28.tar.gz rspamd-701419544ded2fe5c07dd5f614e4edce65d1cc28.zip | |
Add variable for clickhouse port
| -rw-r--r-- | test/functional/cases/210_clickhouse/001_migration.robot | 1 | ||||
| -rw-r--r-- | test/functional/cases/210_clickhouse/clickhouse.py | 2 | ||||
| -rw-r--r-- | test/functional/configs/clickhouse-config.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/cases/210_clickhouse/001_migration.robot b/test/functional/cases/210_clickhouse/001_migration.robot index c2db5b3ec..f54f5c4a2 100644 --- a/test/functional/cases/210_clickhouse/001_migration.robot +++ b/test/functional/cases/210_clickhouse/001_migration.robot @@ -11,6 +11,7 @@ Test Teardown Clickhosue Teardown *** Variables *** ${CONFIG} ${TESTDIR}/configs/clickhouse.conf ${RSPAMD_SCOPE} Suite +${CLICKHOUSE_PORT} ${18123} *** Test Cases *** Initial schema diff --git a/test/functional/cases/210_clickhouse/clickhouse.py b/test/functional/cases/210_clickhouse/clickhouse.py index 4e95eadf6..f5e4646cd 100644 --- a/test/functional/cases/210_clickhouse/clickhouse.py +++ b/test/functional/cases/210_clickhouse/clickhouse.py @@ -8,7 +8,7 @@ __client = None class Client: def __init__(self): - self.port = 18123 + self.port = BuiltIn().get_variable_value('${CLICKHOUSE_PORT}', default=18123) def get_query_string(self): return "http://localhost:%d/?default_format=JSONEachRow" % (self.port) diff --git a/test/functional/configs/clickhouse-config.xml b/test/functional/configs/clickhouse-config.xml index 10530a580..b210748ba 100644 --- a/test/functional/configs/clickhouse-config.xml +++ b/test/functional/configs/clickhouse-config.xml @@ -10,7 +10,7 @@ <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) --> </logger> <!--display_name>production</display_name--> <!-- It is the name that will be shown in the client --> - <http_port>18123</http_port> + <http_port>${CLICKHOUSE_PORT}</http_port> <tcp_port>19000</tcp_port> <!-- For HTTPS and SSL over native protocol. --> |