Merge pull request #23 from fizyk/tmpdir

default logsdir to $TMPDIR
ClearcodeHQ · Aug 25, 2016 · ab9c579 · ab9c579
2 parents ab720a4 + 54626a2
commit ab9c579
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,7 @@ CHANGELOG
 unreleased
 -------
 
+- [feature] - default logsdir to $TMPDIR
 - [feature] - run process on random port by default - enhances xdist experience
 
 1.1.0

diff --git a/README.rst b/README.rst
@@ -84,7 +84,7 @@ You can pick which you prefer, but remember that these settings are handled in t
 +----------------------+--------------------------------------+------------------------------------------------------+----------------------------------------------------+------------------------------+
 | Elasticsearch option | Fixture factory argument             | Command line option                                  | pytest.ini option                                  | Default                      |
 +======================+======================================+======================================================+====================================================+==============================+
-| logs directory       | logsdir                              | --elasticsearch-logsdir                              | elasticsearch_logsdir                              | /tmp                         |
+| logs directory       | logsdir                              | --elasticsearch-logsdir                              | elasticsearch_logsdir                              | $TMPDIR                      |
 +----------------------+--------------------------------------+------------------------------------------------------+----------------------------------------------------+------------------------------+
 | host                 | host                                 | --elasticsearch-host                                 | elasticsearch_host                                 | 127.0.0.1                    |
 +----------------------+--------------------------------------+------------------------------------------------------+----------------------------------------------------+------------------------------+

diff --git a/src/pytest_elasticsearch/plugin.py b/src/pytest_elasticsearch/plugin.py
@@ -17,6 +17,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with pytest-elasticsearch.  If not, see <http://www.gnu.org/licenses/>.
 """Pytest-elasticsearch py.test's plugin configuration."""
+from tempfile import gettempdir
+
 import pytest  # noqa
 
 from pytest_elasticsearch import factories
@@ -38,7 +40,7 @@ def pytest_addoption(parser):
     parser.addini(
         name='elasticsearch_logsdir',
         help=_help_logsdir,
-        default='/tmp'
+        default=gettempdir()
     )
 
     parser.addini(

diff --git a/tests/test_elastic.py b/tests/test_elastic.py
@@ -1,4 +1,6 @@
 """Pytest-elasticsearch tests."""
+from tempfile import gettempdir
+
 from mock import patch
 
 from pytest_elasticsearch import factories
@@ -28,7 +30,7 @@ def test_default_configuration(request):
     """Test default configuration."""
     config = factories.return_config(request)
 
-    assert config['logsdir'] == '/tmp'
+    assert config['logsdir'] == gettempdir()
     assert not config['port']
     assert config['host'] == '127.0.0.1'
     assert not config['cluster_name']