From e527d914cd180958ec6b6a120af27aa093af183e Mon Sep 17 00:00:00 2001 From: bjmb Date: Wed, 24 May 2017 10:34:49 -0400 Subject: [PATCH] Simplified the travis matrix, moved part of it to Jenkins --- .travis.yml | 1 - build.yaml | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 622ddee0..6a341ef3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ python: sudo: false env: - CASS_DRIVER_NO_CYTHON=1 - - addons: apt: diff --git a/build.yaml b/build.yaml index 37ca9de7..a7a9c781 100644 --- a/build.yaml +++ b/build.yaml @@ -103,6 +103,15 @@ build: python setup.py build_ext --inplace --no-cython fi + # Run the unit tests, this is not done in travis because + # it takes too much time for the whole matrix to build with cython + if [[ $CYTHON == 'CYTHON' ]]; then + EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER VERIFY_CYTHON=1 nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=cqle_results.xml tests/unit/ || true + MONKEY_PATCH_LOOP=1 EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER VERIFY_CYTHON=1 nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=cqle_results.xml tests/unit/io/test_eventletreactor.py || true + MONKEY_PATCH_LOOP=1 EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER VERIFY_CYTHON=1 nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=cqle_results.xml tests/unit/io/test_geventreactor.py || true + + fi + echo "Running with event loop manager: $EVENT_LOOP_MANAGER" echo "==========RUNNING CQLENGINE TESTS==========" 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