From: Anton Yuzhaninov <citrin+git@citrin.ru>
Date: Wed, 24 Oct 2018 22:46:11 +0000 (-0400)
Subject: Add variable for clickhouse port
X-Git-Tag: 1.8.2~142^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701419544ded2fe5c07dd5f614e4edce65d1cc28;p=thirdparty%2Frspamd.git

Add variable for clickhouse port
---

diff --git a/test/functional/cases/210_clickhouse/001_migration.robot b/test/functional/cases/210_clickhouse/001_migration.robot
index c2db5b3ec8..f54f5c4a28 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 4e95eadf60..f5e4646cd4 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 10530a580b..b210748ba6 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. -->