diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03d0c1831a77b7c6bf808d9e629d220c92cc2c3d..9689b3e9ee1064d5f7fe7579c5e448a129a35f48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,17 +24,29 @@ pages: - coverage xml - coverage report coverage: /TOTAL.*\s+(\d+\%)/ + services: + - name: rabbitmq:3.13-management + alias: rabbitmq test_python27: extends: .test image: python:2.7 + before_script: + - pip install --upgrade pytest setuptools pip coverage nose2 + - pip install -r requirements.txt test_python35: extends: .test image: python:3.5 + before_script: + - pip install --upgrade pytest setuptools pip coverage nose2 + - pip install -r requirements.txt test_python36: extends: .test + before_script: + - pip install --upgrade pytest setuptools pip coverage nose2 + - pip install -r requirements.txt image: python:3.6 test_python37: diff --git a/setup.py b/setup.py index 7557db2b987e657a361790409823a1dc7b15cd33..d39cc732718471eb88190cf754d6646366a8c82c 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup(keywords=['amqp', 'rabbitmq', 'client', 'network', 'ha', 'high availabilit packages=find_packages(include=['coolamqp', 'coolamqp.*']), install_requires=['six'], # per coverage version for codeclimate-reporter - tests_require=["nose2", "coverage", "nose2[coverage_plugin]"], + tests_require=["pytest", "coverage"], test_suite='nose2.collector.collector', python_requires='!=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*', extras_require={ diff --git a/tests/utils.py b/tests/utils.py index 02058e9d4e3445a4e11dd869a882b2d95e47dac6..279b827536154abacca7f44b1244b06b1a81bb44 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -16,7 +16,7 @@ from coolamqp import Cluster, ClusterNode, ConnectionDown, \ def getamqp(): - amqp = Cluster([ClusterNode(os.environ.get('AMQP_HOST', '127.0.0.1'), 'guest', 'guest')], extra_properties=[ + amqp = Cluster([ClusterNode(os.environ.get('AMQP_HOST', 'rabbitmq'), 'guest', 'guest')], extra_properties=[ (b'mode', (b'Testing', 'S')), ]) amqp.start()