Add: also set a snapshot port in test config templates

Grégory Starck · Grégory Starck · commit 00913fa63fd5 · 2015-03-26T17:39:01.000-04:00
diff --git a/tests/influxdb/client_test_with_server.py b/tests/influxdb/client_test_with_server.py
@@ -116,29 +116,26 @@ def __init__(self, conf_template):
         self.temp_dir_base = tempfile.mkdtemp()
         # "temp_dir_base" will be used for conf file and logs,
         # while "temp_dir_influxdb" is for the databases files/dirs :
-        self.temp_dir_influxdb = tempfile.mkdtemp(
+        tempdir = self.temp_dir_influxdb = tempfile.mkdtemp(
             dir=self.temp_dir_base)
         # we need some "free" ports :
         self.broker_port = get_free_port()
         self.admin_port = get_free_port()
-        # as it's UDP we can reuse the same port as the broker:
         self.udp_port = get_free_port()
+        self.snapshot_port = get_free_port()
 
-        self.logs_file = os.path.join(
-            self.temp_dir_base, 'logs.txt')
+        self.logs_file = os.path.join(self.temp_dir_base, 'logs.txt')
 
         with open(conf_template) as fh:
             conf = fh.read().format(
                 broker_port=self.broker_port,
                 admin_port=self.admin_port,
                 udp_port=self.udp_port,
-                broker_raft_dir=os.path.join(
-                    self.temp_dir_influxdb, 'raft'),
-                broker_node_dir=os.path.join(
-                    self.temp_dir_influxdb, 'db'),
-                influxdb_cluster_dir=os.path.join(
-                    self.temp_dir_influxdb, 'state'),
-                influxdb_logfile=self.logs_file
+                broker_raft_dir=os.path.join(tempdir, 'raft'),
+                broker_node_dir=os.path.join(tempdir, 'db'),
+                cluster_dir=os.path.join(tempdir, 'state'),
+                logfile=self.logs_file,
+                snapshot_port=self.snapshot_port,
             )
 
         conf_file = os.path.join(self.temp_dir_base, 'influxdb.conf')
diff --git a/tests/influxdb/influxdb.conf.template b/tests/influxdb/influxdb.conf.template
@@ -82,10 +82,10 @@ port = {broker_port}
 
 [cluster]
 # Location for cluster state storage. For storing state persistently across restarts.
-dir = "{influxdb_cluster_dir}"
+dir = "{cluster_dir}"
 
 [logging]
-file   = "{influxdb_logfile}" # Leave blank to redirect logs to stderr.
+file   = "{logfile}" # Leave blank to redirect logs to stderr.
 write-tracing = false # If true, enables detailed logging of the write system.
 raft-tracing = false # If true, enables detailed logging of Raft consensus.
 
@@ -97,3 +97,8 @@ enabled = false
 database = "internal"         # The database to which the data is written.
 retention-policy = "default"   # The retention policy within the database.
 write-interval = "1m"          # Period between writing the data.
+
+
+[snapshot]
+bind-address = "127.0.0.1"
+port = {snapshot_port}
diff --git a/tests/influxdb/influxdb.udp_conf.template b/tests/influxdb/influxdb.udp_conf.template
@@ -82,10 +82,10 @@ port = {broker_port}
 
 [cluster]
 # Location for cluster state storage. For storing state persistently across restarts.
-dir = "{influxdb_cluster_dir}"
+dir = "{cluster_dir}"
 
 [logging]
-file   = "{influxdb_logfile}" # Leave blank to redirect logs to stderr.
+file   = "{logfile}" # Leave blank to redirect logs to stderr.
 write-tracing = false # If true, enables detailed logging of the write system.
 raft-tracing = false # If true, enables detailed logging of Raft consensus.
 
@@ -97,3 +97,7 @@ enabled = false
 database = "internal"         # The database to which the data is written.
 retention-policy = "default"   # The retention policy within the database.
 write-interval = "1m"          # Period between writing the data.
+
+[snapshot]
+bind-address = "127.0.0.1"
+port = {snapshot_port}
