Added flake8 validation

eandersson · Sep 10, 2016 · f45fc43 · f45fc43
1 parent f78327e
commit f45fc43
Show file tree

Hide file tree

Showing 20 changed files with 175 additions and 126 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,8 @@ install:
   - pip install -r requirements.txt
   - pip install -r test-requirements.txt
 script: nosetests -v -l DEBUG --logging-level=DEBUG --with-coverage --cover-package=amqpstorm --with-timer --timer-top-n 25
+before_script:
+  - if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then flake8 --ignore=F821 .; fi
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 services:

diff --git a/amqpstorm/__init__.py b/amqpstorm/__init__.py
@@ -20,6 +20,6 @@ def emit(self, record):
 from amqpstorm.message import Message  # noqa
 from amqpstorm.exception import AMQPError  # noqa
 from amqpstorm.exception import AMQPChannelError  # noqa
-from amqpstorm.exception import AMQPMessageError  # noga
+from amqpstorm.exception import AMQPMessageError  # noqa
 from amqpstorm.exception import AMQPConnectionError  # noqa
 from amqpstorm.exception import AMQPInvalidArgument  # noqa
diff --git a/amqpstorm/compatibility.py b/amqpstorm/compatibility.py
@@ -8,14 +8,14 @@
     ssl = None
 
 try:
-    import urlparse
+    import urlparse  # noqa
 except ImportError:
-    import urllib.parse as urlparse
+    import urllib.parse as urlparse  # noqa
 
 try:
-    from urllib import quote
+    from urllib import quote  # noqa
 except ImportError:
-    from urllib.parse import quote
+    from urllib.parse import quote  # noqa
 
 PYTHON3 = sys.version_info >= (3, 0, 0)
 

diff --git a/amqpstorm/connection.py b/amqpstorm/connection.py
@@ -165,10 +165,10 @@ def close(self):
         self.set_state(self.CLOSING)
         self.heartbeat.stop()
         try:
+            self._close_remaining_channels()
             if not self.is_closed and self._io.socket:
                 self._channel0.send_close_connection_frame()
                 self._wait_for_connection_state(Stateful.CLOSED)
-            self._close_remaining_channels()
         except AMQPConnectionError:
             pass
         finally:

diff --git a/amqpstorm/io.py b/amqpstorm/io.py
@@ -233,6 +233,8 @@ def _receive(self):
         """
         data_in = EMPTY_BUFFER
         try:
+            if not self.socket:
+                raise socket.error('connection/socket error')
             data_in = self._read_from_socket()
         except socket.timeout:
             pass

diff --git a/amqpstorm/management/user.py b/amqpstorm/management/user.py
@@ -92,9 +92,9 @@ def set_permission(self, username, virtual_host, configure_regex='.*',
         :param str virtual_host: Virtual host name
         :param str configure_regex: Permission pattern for configuration
                                     operations for this user.
-        :param str write_regex: Permission pattern for write operations 
+        :param str write_regex: Permission pattern for write operations
                                 for this user.
-        :param str read_regex: Permission pattern for read operations 
+        :param str read_regex: Permission pattern for read operations
                                for this user.
 
         :raises ApiError: Raises if the remote server encountered an error.

diff --git a/amqpstorm/tests/functional/generic_tests.py b/amqpstorm/tests/functional/generic_tests.py
@@ -24,10 +24,11 @@
 class PublishAndGetMessagesTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.get'
+    queue_name = None
     message = str(uuid.uuid4())
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -56,9 +57,10 @@ def tearDown(self):
 class PublishAndGetEmptyMessagesTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.get_empty'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -92,9 +94,10 @@ def tearDown(self):
 class PublishAndGetLargeMessageTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.get_large'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.confirm_deliveries()
@@ -120,9 +123,10 @@ def tearDown(self):
 class PublishLargeMessagesAndConsumeTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.large_messages'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.confirm_deliveries()
@@ -141,7 +145,8 @@ def test_functional_publish_5_large_messages(self):
                                        routing_key=self.queue_name)
 
         inbound_messages = []
-        for message in self.channel.build_inbound_messages(break_on_empty=True):
+        for message in \
+                self.channel.build_inbound_messages(break_on_empty=True):
             self.assertEqual(message.body, body)
             inbound_messages.append(message)
         self.assertEqual(len(inbound_messages), messages_to_publish)
@@ -155,9 +160,10 @@ def tearDown(self):
 class PublishEmptyMessagesAndConsumeTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.empty_messages'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.confirm_deliveries()
@@ -176,7 +182,8 @@ def test_functional_publish_5_empty_messages(self):
                                        routing_key=self.queue_name)
 
         inbound_messages = []
-        for message in self.channel.build_inbound_messages(break_on_empty=True):
+        for message in \
+                self.channel.build_inbound_messages(break_on_empty=True):
             self.assertEqual(message.body, body)
             inbound_messages.append(message)
         self.assertEqual(len(inbound_messages), messages_to_publish)
@@ -190,9 +197,10 @@ def tearDown(self):
 class PublishLargeMessagesAndGetTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.large_messages'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.confirm_deliveries()
@@ -225,9 +233,10 @@ def tearDown(self):
 class PublishWithPropertiesAndGetTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.properties'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -289,9 +298,10 @@ def tearDown(self):
 class PublishMessageAndResend(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.resend'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -348,9 +358,10 @@ def tearDown(self):
 class PublishAndConsumeMessagesTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.consume'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -393,9 +404,10 @@ def tearDown(self):
 class GeneratorConsumeMessagesTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.generator'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -429,10 +441,11 @@ def tearDown(self):
 class ConsumeAndRedeliverTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.consume.redeliver'
+    queue_name = None
     message = str(uuid.uuid4())
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -476,10 +489,11 @@ def tearDown(self):
 class GetAndRedeliverTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.get.redeliver'
+    queue_name = None
     message = str(uuid.uuid4())
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -505,9 +519,10 @@ def tearDown(self):
 class PublisherConfirmsTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.confirm'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -534,9 +549,10 @@ def tearDown(self):
 class PublisherConfirmFailsTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.confirm.fails'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.confirm_deliveries()
@@ -557,9 +573,10 @@ def tearDown(self):
 class PublishFailAndFix(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.publish.fail.and.fix'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.confirm_deliveries()
@@ -594,9 +611,10 @@ def tearDown(self):
 class PublishAndFail(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.publish.and.fail'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -618,9 +636,10 @@ def tearDown(self):
 class StartStopConsumeTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.consume'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)

diff --git a/amqpstorm/tests/functional/legacy_tests.py b/amqpstorm/tests/functional/legacy_tests.py
@@ -21,9 +21,10 @@
 class LegacyStartStopConsumeTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.consume'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -68,10 +69,11 @@ def tearDown(self):
 class LegacyPublishAndConsumeMessagesTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.consume'
+    queue_name = None
     message = str(uuid.uuid4())
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -115,9 +117,10 @@ def tearDown(self):
 class LegacyGeneratorConsumeMessagesTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.generator'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)
@@ -156,10 +159,11 @@ def tearDown(self):
 class LegacyublishAndGetMessagesTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.basic.get'
+    queue_name = None
     message = str(uuid.uuid4())
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)

diff --git a/amqpstorm/tests/functional/management/queue_tests.py b/amqpstorm/tests/functional/management/queue_tests.py
@@ -69,7 +69,10 @@ def test_api_queue_list_all(self):
             for queue in queues:
                 self.assertIsInstance(queue, dict)
                 self.assertIn('name', queue)
-                self.assertIn('state', queue)
+                self.assertIn('vhost', queue)
+                self.assertIn('node', queue)
+                self.assertIn('durable', queue)
+                self.assertIn('arguments', queue)
                 self.assertIn('auto_delete', queue)
         finally:
             api.queue.delete(queue_name)

diff --git a/amqpstorm/tests/functional/reliability_tests.py b/amqpstorm/tests/functional/reliability_tests.py
@@ -27,9 +27,10 @@
 class OpenCloseChannelLoopTest(unittest.TestCase):
     connection = None
     channel = None
-    queue_name = 'test.open.close'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD, lazy=True)
 
     def test_functional_open_close_channel_loop(self):
@@ -107,9 +108,10 @@ class Publish5kTest(unittest.TestCase):
     connection = None
     channel = None
     messages_to_send = 5000
-    queue_name = 'test.basic.5k'
+    queue_name = None
 
     def setUp(self):
+        self.queue_name = self.__class__.__name__
         self.connection = Connection(HOST, USERNAME, PASSWORD)
         self.channel = self.connection.channel()
         self.channel.queue.declare(self.queue_name)

diff --git a/amqpstorm/tests/functional/web_based_tests.py b/amqpstorm/tests/functional/web_based_tests.py
@@ -1,6 +1,6 @@
 import logging
-import uuid
 import time
+import uuid
 
 try:
     import unittest2 as unittest