Merge pull request #65 from DataDog/matt/tox

Matt/tox

Author: clutchski

tests/wait-for-services.py

@@ -1,48 +1,70 @@
 import sys
 import time
-
-from psycopg2 import connect, OperationalError
-from cassandra.cluster import Cluster, NoHostAvailable
+import traceback
 
 from contrib.config import POSTGRES_CONFIG, CASSANDRA_CONFIG
 
-
 def try_until_timeout(exception):
     """
     Utility decorator that tries to call a check until there is a timeout.
     The default timeout is about 20 seconds.
     """
     def wrap(fn):
         def wrapper(*args, **kwargs):
-            for attempt in range(100):
+            for i in range(100):
                 try:
                     fn()
                 except exception:
-                    time.sleep(0.2)
+                    if i % 20 == 0:
+                        print(traceback.format_exc())
+                    time.sleep(0.25)
                 else:
                     break;
             else:
                 sys.exit(1)
         return wrapper
     return wrap
 
+def check_postgres():
+    try:
+        from psycopg2 import connect, OperationalError
+    except ImportError:
+        return False
+
+    @try_until_timeout(OperationalError)
+    def _ping():
+        conn = connect(**POSTGRES_CONFIG)
+        try:
+            conn.cursor().execute("SELECT 1;")
+        finally:
+            conn.close()
+
+    _ping()
+
+
+def check_cassandra():
+    try:
+        from cassandra.cluster import Cluster, NoHostAvailable
+    except ImportError:
+        return False
+
+    print('checking cass')
+
+    # wait for cassandra connection
+    @try_until_timeout(NoHostAvailable)
+    def _ping():
+        with Cluster(**CASSANDRA_CONFIG).connect() as conn:
+            conn.execute("SELECT now() FROM system.local")
 
-# wait for a psycopg2 connection
-@try_until_timeout(OperationalError)
-def postgresql_check():
-    with connect(**POSTGRES_CONFIG) as conn:
-        conn.cursor().execute("SELECT 1;")
+    _ping()
 
 
-# wait for cassandra connection
-@try_until_timeout(NoHostAvailable)
-def cassandra_check():
-    with Cluster(**CASSANDRA_CONFIG).connect() as conn:
-        conn.execute("SELECT now() FROM system.local")
+def check():
+    print("checking services")
+    check_postgres()
+    check_cassandra()
+    print("services checked")
 
+if __name__ == '__main__':
+    check()
 
-# checks list
-print("Waiting for backing services...")
-postgresql_check()
-cassandra_check()
-print("All backing services are up and running!")

tox.ini

@@ -3,61 +3,66 @@
 # versions.
 
 [tox]
-# Our various test environments. The py*-all tasks will run
-# common tests and all contrib tests with the latest library versions.
+# Our various test environments. The py*-all tasks will run the core
+# library tests and all contrib tests with the latest library versions.
 # The others will test specific versions of libraries.
 envlist =
-    {py34}-wait-for-services
-    {py27,py34}-all
+    wait
+    flake8
     {py27,py34}-elasticsearch{23}
     {py27,py34}-falcon{10}
-    {py27,py34}-flask{010,011}
-    {py27,py34}-flask{010,011}-flaskcache{013}
-    {py27}-flask{010,011}-flaskcache{012}
-    {py27,py34}-mysql-connector{21}
+    {py27,py34}-flask{010,011}-blinker
+    {py27,py34}-flask{010,011}-flaskcache{013}-memcached-redis-blinker
+    {py27}-flask{010,011}-flaskcache{012}-memcached-redis-blinker
+    {py27,py34}-mysqlconnector{21}
     {py27,py34}-pylibmc{140,150}
-    {py27,py34}-pymongo{30,31,32,33}
-    {py27,py34}-sqlalchemy{10,11}
-    flake8
+    {py27,py34}-pymongo{30,31,32,33}-mongoengine
+    {py27,py34}-sqlalchemy{10,11}-psycopg2
+    {py27,py34}-all
 
 [testenv]
 basepython =
     py27: python2.7
     py34: python3.4
 
 deps =
-# test dependencies
+# test dependencies installed in all envs
     mock
     nose
 # integrations
-    blinker
-    cassandra-driver
-    django
+    all: blinker
+    all: cassandra-driver
+    all: django
     all: elasticsearch
-    elasticsearch23: elasticsearch>=2.3,<2.4
     all: falcon
-    falcon10: falcon>=1.0,<1.1
     all: flask
+    all: flask_cache
+    all: mongoengine
+    all: mysql-connector
+    all: psycopg2
+    all: pylibmc
+    all: pymongo
+    all: python-memcached
+    all: redis
+    all: sqlalchemy
+    blinker: blinker
+    elasticsearch23: elasticsearch>=2.3,<2.4
+    falcon10: falcon>=1.0,<1.1
     flask010: flask>=0.10,<0.11
     flask011: flask>=0.11
-    all: flask_cache
     flaskcache012: flask_cache>=0.12,<0.13
     flaskcache013: flask_cache>=0.13,<0.14
-    mongoengine
-    psycopg2
-    all: mysql-connector
-    mysql-connector21: mysql-connector>=2.1,<2.2
-    all: pylibmc
+    memcached: python-memcached
+    mongoengine: mongoengine
+    mysqlconnector21: mysql-connector>=2.1,<2.2
     pylibmc140: pylibmc>=1.4.0,<1.5.0
     pylibmc150: pylibmc>=1.5.0
-    all: pymongo
     pymongo30: pymongo>=3.0,<3.1
     pymongo31: pymongo>=3.1,<3.2
     pymongo32: pymongo>=3.2,<3.3
     pymongo33: pymongo>=3.3
-    redis
-    python-memcached
-    all: sqlalchemy
+    psycopg2: psycopg2
+    redis: redis
     sqlalchemy10: sqlalchemy>=1.0,<1.1
     sqlalchemy11: sqlalchemy==1.1.0b3
 
@@ -66,21 +71,31 @@ passenv=TEST_*
 
 commands =
 # wait for services script
-    {py34}-wait-services: python tests/wait-for-services.py
+    {py34}-wait: python tests/wait-for-services.py
 # run all tests for the release jobs
     {py27,py34}-all: nosetests {posargs}
 # run subsets of the tests for particular library versions
     {py27,py34}-elasticsearch{23}: nosetests {posargs} tests/contrib/elasticsearch
+    {py27,py34}-flaskcache{013}: nosetests {posargs} tests/contrib/flask_cache
 # flask_cache 0.12 is not python 3 compatible
-    {py27,py34}-flask{010,011}-flaskcache{013}: nosetests {posargs} tests/contrib/flask_cache
-    {py27}-flask{010,011}-flaskcache{012}: nosetests {posargs} tests/contrib/flask_cache
+    {py27}-flaskcache{012}: nosetests {posargs} tests/contrib/flask_cache
     {py27,py34}-flask{010,011}: nosetests {posargs} tests/contrib/flask
     {py27,py34}-falcon{10}: nosetests {posargs} tests/contrib/falcon
-    {py27,py34}-mysql-connector21}: nosetests {posargs} tests/contrib/mysql
+    {py27,py34}-mysqlconnector21: nosetests {posargs} tests/contrib/mysql
     {py27,py34}-pylibmc{140,150}: nosetests {posargs} tests/contrib/pylibmc
-    {py27,py34}-pymongo{30,31,32,33}: nosetests {posargs} tests/contrib/pymongo/ tests/contrib/mongoengine
-    {py27,py34}-sqlalchemy{10,11}: nosetests {posargs} tests/contrib/sqlalchemy tests/contrib/psycopg tests/contrib/sqlite3
+    {py27,py34}-pymongo{30,31,32,33}: nosetests {posargs} tests/contrib/pymongo/
+    {py27,py34}-mongoengine: nosetests {posargs} tests/contrib/mongoengine
+    {py27,py34}-psycopg2: nosetests {posargs} tests/contrib/psycopg
+    {py27,py34}-sqlalchemy{10,11}: nosetests {posargs} tests/contrib/sqlalchemy
 
+[testenv:wait]
+commands=python tests/wait-for-services.py
+basepython=python
+deps=
+    cassandra-driver
+    psycopg2
+# this is somewhat flaky (can fail and still be up) so try the tests anyway
+ignore_outcome=true
 
 [testenv:flake8]
 deps=flake8