Merge pull request #15 from fizyk/make_dest_distinct

made command line option's more distinct to prevent them from influen…
ClearcodeHQ · Aug 16, 2016 · e30600a · e30600a
2 parents 5aac530 + 74f2923
commit e30600a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+unreleased
+-------
+
+- [bugfix] made command line option's dests more distinc, to prevent from influencing other pytest plugins
+
 1.0.0
 -------
 

diff --git a/src/pytest_elasticsearch/factories.py b/src/pytest_elasticsearch/factories.py
@@ -30,13 +30,14 @@ def return_config(request):
     """Return a dictionary with config options."""
     config = {}
     options = [
-        'port', 'host', 'cluster_name',
-        'network_publish_host', 'discovery_zen_ping_multicast_enabled',
-        'index_store_type', 'logs_prefix', 'logsdir'
+        'port', 'host', 'cluster_name', 'network_publish_host',
+        'discovery_zen_ping_multicast_enabled', 'index_store_type',
+        'logs_prefix', 'logsdir'
     ]
     for option in options:
-        conf = request.config.getoption(option) or \
-            request.config.getini('elasticsearch_{0}'.format(option))
+        option_name = 'elasticsearch_' + option
+        conf = request.config.getoption(option_name) or \
+            request.config.getini(option_name)
         if option == 'cluster_name' and not conf:
             port = config['port']
             conf = 'elasticsearch_cluster_{0}'.format(port)

diff --git a/src/pytest_elasticsearch/plugin.py b/src/pytest_elasticsearch/plugin.py
@@ -75,49 +75,49 @@ def pytest_addoption(parser):
         '--elasticsearch-logsdir',
         action='store',
         metavar='path',
-        dest='logsdir',
+        dest='elasticsearch_logsdir',
     )
 
     parser.addoption(
         '--elasticsearch-host',
         action='store',
-        dest='host',
+        dest='elasticsearch_host',
     )
 
     parser.addoption(
         '--elasticsearch-cluster-name',
         action='store',
-        dest='cluster_name',
+        dest='elasticsearch_cluster_name',
     )
 
     parser.addoption(
         '--elasticsearch-index-store-type',
         action='store',
-        dest='index_store_type',
+        dest='elasticsearch_index_store_type',
     )
 
     parser.addoption(
-        '--elasticsearch-network-publish-host)',
+        '--elasticsearch-network-publish-host',
         action='store',
-        dest='network_publish_host',
+        dest='elasticsearch_network_publish_host',
     )
 
     parser.addoption(
         '--elasticsearch-logs-prefix',
         action='store',
-        dest='logs_prefix',
+        dest='elasticsearch_logs_prefix',
     )
 
     parser.addoption(
         '--elasticsearch-discovery-zen-ping-multicast-enabled',
         action='store',
-        dest='discovery_zen_ping_multicast_enabled',
+        dest='elasticsearch_discovery_zen_ping_multicast_enabled',
     )
 
     parser.addoption(
         '--elasticsearch-port',
         action='store',
-        dest='port'
+        dest='elasticsearch_port'
     )
 
 elasticsearch_proc = factories.elasticsearch_proc()

diff --git a/tests/test_elastic.py b/tests/test_elastic.py
@@ -38,7 +38,7 @@ def test_default_configuration(request):
     assert config['logs_prefix'] == ''
 
     logsdir_ini = request.config.getini('elasticsearch_logsdir')
-    logsdir_option = request.config.getoption('logsdir')
+    logsdir_option = request.config.getoption('elasticsearch_logsdir')
 
     assert logsdir_ini == '/tmp'
     assert logsdir_option is None