removes some doctests

Author: saxix

.travis.yml

@@ -46,7 +46,7 @@ install:
   - pip install tox "coverage<=4.0" python-coveralls>=2.5 coveralls>=0.5 codecov
 
 script:
-  - tox -e "py${TRAVIS_PYTHON_VERSION//.}-d${DJANGO//.}-${DB}" -- py.test tests src/concurrency -v
+  - tox -e "py${TRAVIS_PYTHON_VERSION//.}-d${DJANGO//.}-${DB}" -- py.test tests -v
 
 before_success:
   - coverage erase

src/concurrency/config.py

@@ -20,34 +20,6 @@
 
 
 class AppSettings(object):
-    """
-    Class to manage application related settings
-    How to use:
-    >>> import pytest
-    >>> from django.conf import settings
-    >>> from concurrency.utils import fqn
-    >>> settings.APP_OVERRIDE = 'overridden'
-    >>> class MySettings(AppSettings):
-    ...     defaults = {'ENTRY1': 'abc', 'ENTRY2': 123, 'OVERRIDE': None, 'CALLBACK': fqn(fqn)}
-
-    >>> conf = MySettings("APP")
-    >>> str(conf.ENTRY1), str(settings.APP_ENTRY1)
-    ('abc', 'abc')
-    >>> str(conf.OVERRIDE), str(settings.APP_OVERRIDE)
-    ('overridden', 'overridden')
-
-    >>> conf = MySettings("MYAPP")
-    >>> conf.ENTRY2, settings.MYAPP_ENTRY2
-    (123, 123)
-    >>> settings.MYAPP_CALLBACK = fqn
-    >>> conf = MySettings("MYAPP")
-    >>> conf.CALLBACK == fqn
-    True
-    >>> with pytest.raises(ImproperlyConfigured):
-    ...     settings.OTHER_CALLBACK = 222
-    ...     conf = MySettings("OTHER")
-
-    """
     defaults = {
         'ENABLED': True,
         'MANUAL_TRIGGERS': False,

src/concurrency/core.py

@@ -50,7 +50,10 @@ def _select_lock(model_instance, version_value=None):
             logger.debug("Conflict detected on `{0}` pk:`{0.pk}`, "
                          "version `{1}` not found".format(model_instance, value))
             conf._callback(model_instance)
-
+        else:  # pragma: no cover
+            pass
+    else:  # pragma: no cover
+        pass
 
 class ConcurrencyOptions:
     field = None

src/concurrency/management/commands/triggers.py

@@ -74,7 +74,7 @@ def handle(self, *args, **options):
                         for trigger in triggers:
                             self.stdout.write("    Dropped   {0[2]}".format(trigger))
                     self.stdout.write('')
-                else:
+                else:  # pragma: no cover
                     raise Exception()
             except ImproperlyConfigured as e:  # pragma: no cover
                 self.stdout.write(self.style.ERROR(e))

src/concurrency/middleware.py

@@ -30,3 +30,5 @@ def process_exception(self, request, exception):
             got_request_exception.send(sender=self, request=request)
             callback = get_callable(conf.HANDLER409)
             return callback(request, target=exception.target)
+        else:  # pragma: no cover
+            pass

src/concurrency/triggers.py

@@ -99,6 +99,8 @@ def create(self, field):
                 raise DatabaseError("""Error executing:
 {1}
 {0}""".format(exc, stm))
+        else:  # pragma: no cover
+            pass
         field._trigger_exists = True
 
     def drop(self, field):

src/concurrency/utils.py

@@ -114,7 +114,7 @@ class ConcurrencyAdminTestMixin(object):
 def refetch(model_instance):
     """
     Reload model instance from the database
-    """
+    # """
     return model_instance.__class__.objects.get(pk=model_instance.pk)
 
 
@@ -166,16 +166,16 @@ def fqn(o):
     """
     parts = []
 
-    if inspect.ismethod(o):
-        try:
-            cls = o.im_class
-        except AttributeError:
-            # Python 3 eliminates im_class, substitutes __module__ and
-            # __qualname__ to provide similar information.
-            parts = (o.__module__, o.__qualname__)
-        else:
-            parts = (fqn(cls), get_classname(o))
-    elif hasattr(o, '__module__'):
+    # if inspect.ismethod(o):
+    #     try:
+    #         cls = o.im_class
+    #     except AttributeError:
+    #         # Python 3 eliminates im_class, substitutes __module__ and
+    #         # __qualname__ to provide similar information.
+    #         parts = (o.__module__, o.__qualname__)
+    #     else:
+    #         parts = (fqn(cls), get_classname(o))
+    if hasattr(o, '__module__'):
         parts.append(o.__module__)
         parts.append(get_classname(o))
     elif inspect.ismodule(o):

tests/test_command.py

@@ -26,6 +26,21 @@ def test_command_create(monkeypatch):
     assert mock_create.call_count == 1
 
 
+@pytest.mark.django_db
+def test_command_create_db(monkeypatch):
+    out = six.StringIO()
+    mock_create = Mock()
+    mock_create.return_value = {'default': [['model', 'field', 'trigger']]}
+
+    monkeypatch.setattr(command, 'create_triggers', mock_create)
+    call_command('triggers', 'create', database='default', stdout=out)
+
+    out.seek(0)
+    output = out.read()
+    assert output.find('Created trigger  for field') > 0
+    assert mock_create.call_count == 1
+
+
 @pytest.mark.django_db
 def test_command_list():
     out = six.StringIO()

tests/test_config.py

@@ -0,0 +1,30 @@
+import pytest
+from django.core.exceptions import ImproperlyConfigured
+
+from concurrency.config import AppSettings
+from concurrency.utils import fqn
+
+
+def test_config(settings):
+    settings.APP_OVERRIDE = 'overridden'
+    class MySettings(AppSettings):
+        defaults = {'ENTRY1': 'abc',
+                    'ENTRY2': 123,
+                    'OVERRIDE': None,
+                    'CALLBACK': fqn(fqn)}
+
+    conf = MySettings("APP")
+    assert str(conf.ENTRY1) == str(settings.APP_ENTRY1)
+
+    assert str(conf.OVERRIDE) == str(settings.APP_OVERRIDE)
+
+    conf = MySettings("MYAPP")
+    assert conf.ENTRY2 == settings.MYAPP_ENTRY2
+
+    settings.MYAPP_CALLBACK = fqn
+    conf = MySettings("MYAPP")
+    assert conf.CALLBACK == fqn
+
+    with pytest.raises(ImproperlyConfigured):
+        settings.OTHER_CALLBACK = 222
+        conf = MySettings("OTHER")

tests/test_core.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+
+import pytest
+
+from concurrency.core import _select_lock
+from concurrency.exceptions import RecordModifiedError
+from concurrency.utils import refetch
+from demo.models import SimpleConcurrentModel
+
+
+@pytest.mark.django_db
+def test_select_lock(settings):
+    s1 = SimpleConcurrentModel.objects.create()
+    s2 = refetch(s1)
+    assert s1.version == s2.version
+    s2.save()
+    with pytest.raises(RecordModifiedError):
+        _select_lock(s1)
+
+    settings.CONCURRENCY_ENABLED = False
+    _select_lock(s1)
+