From d5f9fff71ccd397c484f9df7f108bb62f1cf5448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ma=C5=9Blanka?= <piotr.maslanka@ericsson.com>
Date: Sun, 1 Sep 2024 15:53:26 +0200
Subject: [PATCH] fix test
---
.gitlab-ci.yml | 12 ++++++++++++
setup.py | 2 +-
tests/utils.py | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03d0c18..9689b3e 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 7557db2..d39cc73 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 02058e9..279b827 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()
--
GitLab