Browse Source

Correct optional deps for tests

David Cramer 10 years ago
parent
commit
09ec13bc9b

+ 1 - 0
.travis.yml

@@ -1,5 +1,6 @@
 language: python
 services:
+  - elasticsearch
   - memcached
   - riak
   - mysql

+ 3 - 3
src/sentry/testutils/skips.py

@@ -20,7 +20,7 @@ def riak_is_available():
 
 
 requires_riak = pytest.mark.skipif(
-    lambda x: not riak_is_available(),
+    not riak_is_available(),
     reason="requires riak server running")
 
 
@@ -34,7 +34,7 @@ def cassandra_is_available():
 
 
 requires_cassandra = pytest.mark.skipif(
-    lambda x: not cassandra_is_available(),
+    not cassandra_is_available(),
     reason="requires cassandra server running")
 
 
@@ -48,5 +48,5 @@ def elastic_search_is_available():
 
 
 requires_elastic_search = pytest.mark.skipif(
-    lambda x: not elastic_search_is_available(),
+    not elastic_search_is_available(),
     reason="requires elastic search server running")

+ 2 - 0
tests/sentry/search/elastic_search/test_backend.py

@@ -5,8 +5,10 @@ from __future__ import absolute_import
 from sentry.constants import STATUS_RESOLVED, STATUS_UNRESOLVED
 from sentry.search.elastic_search.backend import ElasticSearchBackend
 from sentry.testutils import TestCase
+from sentry.testutils.skips import requires_elastic_search
 
 
+@requires_elastic_search
 class ElasticSearchTest(TestCase):
     def setUp(self):
         from elasticsearch import Elasticsearch