added more tests

Author: tmehlinger

squishy/noop.py

@@ -9,9 +9,19 @@
 log = logging.getLogger(__name__)
 
 
+noop_dummy = object()
+
+
 def noop_callback(message):
     log.info(pprint.pformat(message))
 
 
+class NoopCallback(object):  # pylint: disable=too-few-public-methods
+    def __call__(self, message):
+        log.info(pprint.pformat(message))
+
+noop_callback_obj = NoopCallback()
+
+
 def noop_session_factory():
     return Session()

squishy/workers/__init__.py

@@ -2,9 +2,10 @@
 
 
 WORKER_CLASSES = {
-    'gevent': 'squishy.workers.gevent.GeventWorker',
-    'futures_process': 'squishy.workers.futures.ProcessPoolWorker',
-    'futures_thread': 'squishy.workers.futures.ThreadPoolWorker',
-    'mp_process': 'squishy.workers.multiprocessing.ProcessPoolWorker',
-    'mp_thread': 'squishy.workers.multiprocessing.ThreadPoolWorker',
+    'gevent': 'squishy.workers.gevent:GeventWorker',
+    'futures_process': 'squishy.workers.futures:ProcessPoolWorker',
+    'futures_thread': 'squishy.workers.futures:ThreadPoolWorker',
+    'mp_process': 'squishy.workers.multiprocessing:ProcessPoolWorker',
+    'mp_thread': 'squishy.workers.multiprocessing:ThreadPoolWorker',
+    'noop': 'squishy.workers.noop:NoopWorker',
 }

squishy/workers/noop.py

@@ -0,0 +1,14 @@
+from __future__ import absolute_import
+
+
+class NoopWorker(object):
+    __name__ = 'NoopWorker'
+
+    def __init__(self, *args, **kwargs):
+        pass
+
+    def process_messages(self, _):
+        pass
+
+    def shutdown(self):
+        pass

tests/test_cli.py

@@ -0,0 +1,91 @@
+import logging
+
+import click
+from click.testing import CliRunner
+import mock
+import pytest
+
+from squishy import cli
+from squishy.consumer import SqsConsumer
+from squishy.noop import noop_callback
+from squishy.workers.noop import NoopWorker
+
+
+def test_get_log_level():
+    for level in cli.LOG_CHOICES.choices:
+        assert (cli.get_log_level(None, None, level) ==
+                getattr(logging, level.upper()))
+
+
+def test_import_callable_func():
+    func = cli.import_callable(None, None, 'squishy.noop:noop_callback')
+    assert callable(func)
+    assert func(None) is None
+
+
+def test_import_callable_object():
+    obj = cli.import_callable(None, None, 'squishy.noop:noop_callback_obj')
+    assert callable(obj)
+    assert obj(None) is None
+
+
+@pytest.mark.parametrize('spec', [
+    'not_importable',
+    'not.importable',
+])
+def test_import_callable_invalid_import_spec(spec):
+    with pytest.raises(click.BadParameter) as e:
+        cli.import_callable(None, None, spec)
+    assert 'string to import' in e.value.args[0]
+
+
+def test_import_callable_no_attribute():
+    with pytest.raises(click.BadParameter) as e:
+        cli.import_callable(None, None, 'squishy.noop:missing_attribute')
+    assert 'does not exist' in e.value.args[0]
+
+
+def test_import_callable_attribute_is_not_callable():
+    with pytest.raises(RuntimeError) as e:
+        cli.import_callable(None, None, 'squishy.noop:noop_dummy')
+    assert 'is not callable' in e.value.args[0]
+
+
+def test_import_callable_none_value():
+    assert cli.import_callable(None, None, None) is None
+
+
+def test_import_worker():
+    func = cli.import_worker(None, None, 'futures_process')
+    assert callable(func)
+
+
+def test_import_gevent_worker():
+    import gevent.monkey
+    with mock.patch('gevent.monkey', spec=gevent.monkey) as m:
+        func = cli.import_worker(None, None, 'gevent')
+        assert callable(func)
+        assert len(m.patch_socket.mock_calls) == 1
+        assert len(m.patch_ssl.mock_calls) == 1
+
+
+@mock.patch('squishy.cli.SqsConsumer', spec=SqsConsumer)
+@mock.patch('squishy.workers.noop.NoopWorker', spec=NoopWorker)
+def test_run_consumer(w_mock, c_mock):
+    url = 'https://localhost/test/url'
+    callback = 'squishy.noop:noop_callback'
+    worker = 'noop'
+
+    runner = CliRunner()
+    result = runner.invoke(cli.run_consumer,
+                           [url, callback, '--worker-class', worker])
+
+    assert result.exit_code == 0
+
+    consumer_calls = [
+        mock.call(url, use_short_polling=False, worker=w_mock.return_value,
+                  polling_timeout=20, polling_count=10),
+        mock.call().run(),
+    ]
+    assert c_mock.mock_calls == consumer_calls
+    assert w_mock.mock_calls[0] == mock.call(noop_callback, pool_size=8)

tests/test_logging.py

@@ -0,0 +1,10 @@
+import logging
+
+import squishy.logging as squishy_logging
+
+
+def test_get_logger():
+    name = 'testing'
+    logger = squishy_logging.get_logger(name)
+    assert logger.name == name
+    assert isinstance(logger.handlers[0], logging.NullHandler)

tests/test_noop.py

@@ -1,2 +1,13 @@
-def test_noop():
-    return True
+from __future__ import absolute_import
+
+from boto3 import Session
+
+from squishy import noop
+
+
+def test_noop_callback():
+    assert noop.noop_callback(None) is None
+
+
+def test_noop_session_factory():
+    assert isinstance(noop.noop_session_factory(), Session)

tests/test_workers.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from squishy.workers import futures, gevent, multiprocessing
+from squishy.workers import base, futures, gevent, multiprocessing
 
 
 # we declare Callback, Errback and Message mocks here rather than using
@@ -50,3 +50,15 @@ def test_process_messages_with_exception(worker_cls):
     to_delete = w.process_messages([msg])
     w.shutdown()
     assert len(to_delete) == 0
+
+
+def test_base_process_messages():
+    w = base.BaseWorker(None)
+    with pytest.raises(NotImplementedError):
+        w.process_messages(None)
+
+
+def test_base_shutdown():
+    w = base.BaseWorker(None)
+    with pytest.raises(NotImplementedError):
+        w.shutdown()