Merge branch 'dockerize' of github.com:abrookins/redis-py into dockerize

2 files changed, 8 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index ad1eb55..f86cbad 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@
 
 build:
 	docker build -t redis-py-base docker/base
-	docker-compose down
 	docker-compose build
 
 dev:
@@ -10,4 +9,4 @@ dev:
 
 test: dev
 	find . -name "*.pyc" -exec rm -f {} \;
-	docker-compose run test tox -- --redis-url="redis://master:6379/9" --redis-master-host=master
+	docker-compose run test tox -- --redis-url=redis://master:6379/9
diff --git a/tests/conftest.py b/tests/conftest.py
index 704a7e3..caca8cc 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,6 +4,7 @@ import pytest
 import redis
 from mock import Mock
 
+from redis._compat import urlparse
 from distutils.version import StrictVersion
 
 
@@ -14,19 +15,14 @@ REDIS_6_VERSION = '5.9.0'
 
 
 REDIS_INFO = {}
-DEFAULT_REDIS_URL = "redis://localhost:6379/9"
-DEFAULT_REDIS_MASTER_HOST = "localhost"
+default_redis_url = "redis://localhost:6379/9"
 
 
 def pytest_addoption(parser):
-    parser.addoption('--redis-url', default=DEFAULT_REDIS_URL,
+    parser.addoption('--redis-url', default=default_redis_url,
                      action="store",
                      help="Redis connection string,"
                           " defaults to `%(default)s`")
-    parser.addoption('--redis-master-host', default=DEFAULT_REDIS_MASTER_HOST,
-                     action="store",
-                     help="Redis master hostname,"
-                          " defaults to `%(default)s`")
 
 
 def _get_info(redis_url):
@@ -161,9 +157,11 @@ def mock_cluster_resp_slaves(request, **kwargs):
     return _gen_cluster_mock_resp(r, response)
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture(scope="session")
 def master_host(request):
-    yield request.config.getoption("--redis-master-host")
+    url = request.config.getoption("--redis-url")
+    parts = urlparse(url)
+    yield parts.hostname
 
 
 def wait_for_command(client, monitor, command):