Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ python:
- 3.6

os:
- ubuntu/trusty64
- ubuntu/bionic64/python-driver

cassandra:
- '2.1'
Expand All @@ -122,9 +122,7 @@ build:
pip install --upgrade pip
pip install -U setuptools

pip install git+https://github.com/pcmanus/ccm.git
# Install dependencies
sudo apt-get install -y libev4 libev-dev libssl-dev
pip install git+https://github.com/riptano/ccm.git

pip install -r test-requirements.txt
pip install nose-ignore-docstring
Expand All @@ -143,15 +141,6 @@ build:
python setup.py build_ext --inplace --no-cython
fi

echo "Installing simulacron"
pushd ~

SIMULACRON_JAR=`find \`pwd\` -name "simulacron-standalone-*.jar"`
echo "SIMULACRON_JAR: $SIMULACRON_JAR"

popd


echo "JUST_UPGRADE: $JUST_UPGRADE"
if [[ $JUST_UPGRADE == 'True' ]]; then
EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=upgrade_results.xml tests/integration/upgrade || true
Expand All @@ -170,6 +159,7 @@ build:

echo "Running with event loop manager: $EVENT_LOOP_MANAGER"
echo "==========RUNNING SIMULACRON TESTS=========="
SIMULACRON_JAR="$HOME/simulacron.jar"
SIMULACRON_JAR=$SIMULACRON_JAR EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CASSANDRA_DIR=$CCM_INSTALL_DIR DSE_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=simulacron_results.xml tests/integration/simulacron/ || true

echo "Running with event loop manager: $EVENT_LOOP_MANAGER"
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/io/test_asyncioreactor.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import asynctest
ASYNCIO_AVAILABLE = True
except (ImportError, SyntaxError):
AysncioConnection = None
AsyncioConnection = None
ASYNCIO_AVAILABLE = False

from tests import is_monkey_patched, connection_class
Expand Down