From a4d0f7468465af46eb25cc5ec60b379b9467ed1f Mon Sep 17 00:00:00 2001 From: Dalton Barreto Date: Mon, 10 Oct 2016 11:15:13 -0300 Subject: [PATCH 1/7] Adding requirements-dev.txt This will help setting ip the dev environment --- requirements-dev.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 requirements-dev.txt diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..355a466 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,4 @@ +mock==2.0.0 +pytest==3.0.3 +pytest-cov==2.3.1 + From 17827c8ad334daf9591f1850a9264554253bfefe Mon Sep 17 00:00:00 2001 From: Dalton Barreto Date: Mon, 10 Oct 2016 11:15:55 -0300 Subject: [PATCH 2/7] Adding requirements.txt Needed to fully install a usable version of equeue --- requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..a370469 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +amqp==2.1.0 +simplejson==3.8.2 From 188b616f64287dce9a791d9eedcf9549391e11f0 Mon Sep 17 00:00:00 2001 From: Dalton Barreto Date: Mon, 10 Oct 2016 11:14:14 -0300 Subject: [PATCH 3/7] Update README about running tests --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bba0f5e..592aa74 100644 --- a/README.md +++ b/README.md @@ -75,9 +75,17 @@ Then ### Developing mode -Run tests +Running tests + +To run the project's test you will need to have pytest installed. The instalation is simple as : + +```shell +$ pip install pytest +``` + +And to run the tests you need to ajust yout `PYTHONPATH` ```shell - $ py.test + $ PYTHONPATH=equeue py.test ``` From cb8aeb5b6a76b17df08d3ef7ff5cc4ee417b8a4e Mon Sep 17 00:00:00 2001 From: Jesue Junior Date: Mon, 27 Nov 2017 22:32:08 -0200 Subject: [PATCH 4/7] migrating tests package --- tests/__init__.py | 0 {equeue/tests => tests}/rabbit/test_publisher.py | 11 ++++++----- {equeue/tests => tests}/rabbit/test_queue.py | 9 +++++---- {equeue/tests => tests}/rabbit/test_subscriber.py | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 tests/__init__.py rename {equeue/tests => tests}/rabbit/test_publisher.py (90%) rename {equeue/tests => tests}/rabbit/test_queue.py (97%) rename {equeue/tests => tests}/rabbit/test_subscriber.py (94%) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/equeue/tests/rabbit/test_publisher.py b/tests/rabbit/test_publisher.py similarity index 90% rename from equeue/tests/rabbit/test_publisher.py rename to tests/rabbit/test_publisher.py index 24d3ed1..a9b7aac 100644 --- a/equeue/tests/rabbit/test_publisher.py +++ b/tests/rabbit/test_publisher.py @@ -1,12 +1,13 @@ -from datetime import datetime -import json +#encoding: utf-8 import unittest +from datetime import datetime +import simplejson as json from amqp import Message, AMQPError, ConnectionError from mock import MagicMock, patch, call, Mock, ANY -from rabbit.queue import SerializationError -from rabbit.publisher import Publisher +from equeue.rabbit.queue import SerializationError +from equeue.rabbit.publisher import Publisher class RabbitQueueTest(unittest.TestCase): @@ -44,7 +45,7 @@ def test_put_default_exchange_if_not_supplied(self): def test_put_serializes_message_if_necessary(self): message = {'key': 'value'} - with patch('rabbit.publisher.Publisher') as MockPublisher: + with patch('equeue.rabbit.publisher.Publisher') as MockPublisher: self.publisher.put(message_dict=message) self.assertEqual(MockPublisher.call_args_list, diff --git a/equeue/tests/rabbit/test_queue.py b/tests/rabbit/test_queue.py similarity index 97% rename from equeue/tests/rabbit/test_queue.py rename to tests/rabbit/test_queue.py index 64dc5bd..264479f 100644 --- a/equeue/tests/rabbit/test_queue.py +++ b/tests/rabbit/test_queue.py @@ -1,13 +1,14 @@ -from datetime import datetime -import json +#encoding: utf-8 import unittest +from datetime import datetime +import simplejson as json from amqp import Message, AMQPError, ConnectionError from mock import MagicMock, patch, call, Mock, ANY -from rabbit.queue import (RabbitQueue, MAX_TRIES, SerializationError, META_FIELD) +from equeue.rabbit.queue import (RabbitQueue, MAX_TRIES, SerializationError, META_FIELD) -MODULE = 'rabbit.queue.' +MODULE = 'equeue.rabbit.queue.' class RabbitQueueTest(unittest.TestCase): diff --git a/equeue/tests/rabbit/test_subscriber.py b/tests/rabbit/test_subscriber.py similarity index 94% rename from equeue/tests/rabbit/test_subscriber.py rename to tests/rabbit/test_subscriber.py index 03acb0f..a617253 100644 --- a/equeue/tests/rabbit/test_subscriber.py +++ b/tests/rabbit/test_subscriber.py @@ -5,7 +5,7 @@ from amqp import Message, AMQPError, ConnectionError from mock import MagicMock, patch, call, Mock, ANY -from rabbit.subscriber import Subscriber +from equeue.rabbit.subscriber import Subscriber class SubscriberTest(unittest.TestCase): @@ -47,7 +47,7 @@ def test_get_sleeps_and_tries_again_until_queue_is_not_empty(self): empty_rv = None self.channel_mock.basic_get.side_effect = [empty_rv, empty_rv, self.message] with patch('time.sleep') as sleep,\ - patch('rabbit.queue.RabbitQueue._parse_message') as parse_message_mock: + patch('equeue.rabbit.queue.RabbitQueue._parse_message') as parse_message_mock: message = self.subscriber.get(queue_name='queue_name') self.assertEqual(message, parse_message_mock.return_value) From 8d942648f0d66c629658e1743d5c6edb5bce8baf Mon Sep 17 00:00:00 2001 From: Jesue Junior Date: Mon, 27 Nov 2017 22:33:30 -0200 Subject: [PATCH 5/7] Fixing package import --- equeue/rabbit/publisher.py | 2 +- equeue/rabbit/queue.py | 4 ++-- equeue/rabbit/subscriber.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/equeue/rabbit/publisher.py b/equeue/rabbit/publisher.py index 4b0ef5f..568ca3c 100644 --- a/equeue/rabbit/publisher.py +++ b/equeue/rabbit/publisher.py @@ -1,7 +1,7 @@ # encondign: utf-8 import simplejson as json from amqp import Message -from rabbit.queue import RabbitQueue, SerializationError +from equeue.rabbit.queue import RabbitQueue, SerializationError class Publisher(RabbitQueue): diff --git a/equeue/rabbit/queue.py b/equeue/rabbit/queue.py index 41c6f2d..d5ca3ea 100644 --- a/equeue/rabbit/queue.py +++ b/equeue/rabbit/queue.py @@ -1,10 +1,10 @@ -from datetime import datetime import time import uuid +from datetime import datetime +import simplejson as json import amqp from amqp import Message, AMQPError, ConnectionError as AMQPConnectionError -import simplejson as json MAX_TRIES = 3 META_FIELD = "_meta" diff --git a/equeue/rabbit/subscriber.py b/equeue/rabbit/subscriber.py index 06ca975..0a8cc73 100644 --- a/equeue/rabbit/subscriber.py +++ b/equeue/rabbit/subscriber.py @@ -1,6 +1,6 @@ # enconding: utf-8 import time -from rabbit.queue import RabbitQueue +from equeue.rabbit.queue import RabbitQueue class Subscriber(RabbitQueue): From 0f565e40f4abe56ad4c73b3c07e2f8351ab5b6ce Mon Sep 17 00:00:00 2001 From: Jesue Junior Date: Sat, 23 Dec 2017 19:53:21 -0200 Subject: [PATCH 6/7] Adding some test tools --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index f01848b..775d716 100644 --- a/setup.py +++ b/setup.py @@ -18,8 +18,8 @@ packages=find_packages(), install_requires=['amqp==2.1.0', 'simplejson>=3.8.2', 'six==1.10.0'], test_suite='tests', - tests_require=['tox>=2.3.1'] + ( - ['mock==1.3.0'] if sys.version_info.major == 2 else [] + tests_require=['tox>=2.3.1', 'pytest==3.0.3', 'pytest-cov==2.3.1'] + ( + ['mock==2.0.0'] if sys.version_info.major == 2 else [] ), classifiers=[ 'Intended Audience :: Developers', From 46e31842f75c50d43e230684b011fb1f8aafd7a6 Mon Sep 17 00:00:00 2001 From: Jesue Junior Date: Sat, 23 Dec 2017 20:19:00 -0200 Subject: [PATCH 7/7] bump version --- equeue/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/equeue/__init__.py b/equeue/__init__.py index 7525d19..66a87bb 100644 --- a/equeue/__init__.py +++ b/equeue/__init__.py @@ -1 +1 @@ -__version__ = '0.1.4' +__version__ = '0.1.5'