Merge pull request apache#735 from datastax/python-gevent-integration-tests

Jaume Marhuenda · web-flow · commit 00f2f61f45f0 · 2017-04-10T16:46:34.000-04:00
Added support for different loops in integrations tests
diff --git a/build.yaml b/build.yaml
@@ -3,6 +3,49 @@ schedules:
     schedule: per_commit
     branches:
       include: [master, /python.*/]
+    env_vars: |
+      EVENT_LOOP_MANAGER='libev'
+
+  nightly_libev:
+    schedule: nightly
+    branches:
+      include: [master]
+    env_vars: |
+      EVENT_LOOP_MANAGER='libev'
+    matrix:
+      exclude:
+        - cassandra: ['2.0', '2.1', '2.2', '3.0']
+
+  nightly_gevent:
+    schedule: nightly
+    branches:
+      include: [master]
+    env_vars: |
+      EVENT_LOOP_MANAGER='gevent'
+    matrix:
+      exclude:
+        - pythoon: 3.4
+        - cassandra: ['2.0', '2.1', '2.2', '3.0']
+
+  nightly_eventlet:
+    schedule: nightly
+    branches:
+      include: [master]
+    env_vars: |
+      EVENT_LOOP_MANAGER='eventlet'
+    matrix:
+      exclude:
+        - cassandra: ['2.0', '2.1', '2.2', '3.0']
+
+  nightly_async:
+    schedule: nightly
+    branches:
+      include: [master]
+    env_vars: |
+      EVENT_LOOP_MANAGER='async'
+    matrix:
+      exclude:
+        - cassandra: ['2.0', '2.1', '2.2', '3.0']
 
 python:
   - 2.7
@@ -16,8 +59,6 @@ cassandra:
   - '3.0'
   - '3.11'
 env:
-  EVENT_LOOP_MANAGER:
-    - libev
   CYTHON:
     - CYTHON
     - NO_CYTHON
@@ -28,9 +69,7 @@ build:
 
       pip install git+https://github.com/pcmanus/ccm.git
       # Install dependencies
-      if [[ $EVENT_LOOP_MANAGER == 'libev' ]]; then
-        sudo apt-get install -y libev4 libev-dev
-      fi
+      sudo apt-get install -y libev4 libev-dev
       pip install -r test-requirements.txt
       pip install nose-ignore-docstring
       FORCE_CYTHON=False
@@ -46,12 +85,12 @@ build:
       fi
 
       echo "==========RUNNING CQLENGINE TESTS=========="
-      CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=cqle_results.xml tests/integration/cqlengine/ || true
+      EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=cqle_results.xml tests/integration/cqlengine/ || true
 
       echo "==========RUNNING INTEGRATION TESTS=========="
-      CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=standard_results.xml tests/integration/standard/ || true
+      EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=standard_results.xml tests/integration/standard/ || true
 
       echo "==========RUNNING LONG INTEGRATION TESTS=========="
-      CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=long_results.xml tests/integration/long/ || true
+      EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=long_results.xml tests/integration/long/ || true
   - xunit:
     - "*_results.xml"
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -11,14 +11,39 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import os
+
+from cassandra.io.geventreactor import GeventConnection
+from cassandra.io.libevreactor import LibevConnection
+from cassandra.io.asyncorereactor import AsyncoreConnection
+from cassandra.io.eventletreactor import EventletConnection
+from cassandra.io.twistedreactor import TwistedConnection
+
+EVENT_LOOP_MANAGER = os.getenv('EVENT_LOOP_MANAGER', "gevent")
+if EVENT_LOOP_MANAGER == "gevent":
+    import gevent.monkey
+    gevent.monkey.patch_all()
+    connection_class = GeventConnection
+elif EVENT_LOOP_MANAGER == "eventlet":
+    from eventlet import monkey_patch
+    monkey_patch()
+    connection_class = EventletConnection
+elif EVENT_LOOP_MANAGER == "async":
+    connection_class = AsyncoreConnection
+elif EVENT_LOOP_MANAGER == "twisted":
+    connection_class = TwistedConnection
+else:
+    connection_class = LibevConnection
+
+from cassandra.cluster import Cluster
+Cluster.connection_class = connection_class
 
 try:
     import unittest2 as unittest
 except ImportError:
     import unittest  # noqa
 from packaging.version import Version
 import logging
-import os
 import socket
 import sys
 import time
@@ -30,9 +55,8 @@
 
 from cassandra import OperationTimedOut, ReadTimeout, ReadFailure, WriteTimeout, WriteFailure, AlreadyExists, \
     InvalidRequest
-from cassandra.cluster import Cluster
+
 from cassandra.protocol import ConfigurationException
-from cassandra.policies import RoundRobinPolicy
 
 try:
     from ccmlib.cluster import Cluster as CCMCluster
