skip redis/ES tests if the required environment is missing (#561)

closes #561

Author: beniwohli

tests/instrumentation/elasticsearch_tests.py

@@ -39,7 +39,10 @@
 
 from elasticapm.conf.constants import TRANSACTION
 
-pytestmark = pytest.mark.elasticsearch
+if "ES_URL" not in os.environ:
+    pytestmark = pytest.mark.skip("Skipping elasticsearch test, no ES_URL environment variable")
+else:
+    pytestmark = pytest.mark.elasticsearch
 
 document_type = "_doc" if ES_VERSION[0] >= 6 else "doc"
 

tests/instrumentation/redis_tests.py

@@ -41,12 +41,15 @@
 from elasticapm.conf.constants import TRANSACTION
 from elasticapm.traces import capture_span
 
-pytestmark = pytest.mark.redis
+if "REDIS_HOST" not in os.environ:
+    pytestmark = pytest.mark.skip("Skipping redis tests, no REDIS_HOST environment variable set")
+else:
+    pytestmark = pytest.mark.redis
 
 
 @pytest.fixture()
 def redis_conn():
-    conn = redis.StrictRedis(host=os.environ.get("REDIS_HOST", "localhost"), port=os.environ.get("REDIS_PORT", 6379))
+    conn = redis.StrictRedis(host=os.environ["REDIS_HOST"], port=os.environ.get("REDIS_PORT", 6379))
     yield conn
     del conn