Add tox

.coveragerc

@@ -0,0 +1,2 @@
+[run]
+omit = setup.py

.gitignore

@@ -19,10 +19,11 @@ develop-eggs
 pip-log.txt
 
 # Unit test / coverage reports
+coverage.xml
 .coverage
 .tox
 
 #Mr Developer
 .mr.developer.cfg
 
-/.eggs/
+/.eggs/

README.rst

@@ -34,7 +34,7 @@ Test
 You can run the tests with
 ::
 
-    python setup.py test
+    tox
 
 Wishlist
 --------
@@ -45,6 +45,8 @@ Wishlist
 
 Releases
 --------
+v1.2.0:
+  Move id to UUIDField, add code quality checks and CI
 v1.1.0:
   Rename model to NonBlockingLock and add additional features
 v1.0.1:

circle.yml

@@ -4,4 +4,7 @@ machine:
 
 test:
     override:
-        - python setup.py test
+        - tox
+    post:
+        - pip install codecov
+        - codecov --token=${CODECOV_TOKEN}

deployment/requirements_test.txt

@@ -0,0 +1,4 @@
+Django
+freezegun
+tox
+coverage

locking/__init__.py

@@ -1,16 +1 @@
-#: The version list
-VERSION = (1, 1, 0)
-
-
-def get_version():
-    '''
-    Converts the :attr:`VERSION` into a nice string
-    '''
-    if len(VERSION) > 3 and VERSION[3] not in ('final', ''):
-        return '%s.%s.%s %s' % (VERSION[0], VERSION[1], VERSION[2], VERSION[3])
-    else:
-        return '%s.%s.%s' % (VERSION[0], VERSION[1], VERSION[2])
-
-
-#: The version python displays
-__version__ = get_version()
+__version__ = '1.2.0'

locking/tests.py

@@ -10,7 +10,7 @@
 
 from django.contrib.auth.models import User
 
-from .exceptions import AlreadyLocked, RenewalError
+from .exceptions import AlreadyLocked, RenewalError, NonexistentLock, NotLocked
 from .models import NonBlockingLock, _get_lock_name
 
 
@@ -20,6 +20,8 @@ def setUp(self):
 
     def test_acquire_and_release(self):
         ''' Tests an aquire/release cycle '''
+        self.assertRaises(NotLocked, NonBlockingLock.objects.release_lock, 0)
+
         l = NonBlockingLock.objects.acquire_lock(self.user)
         self.assertTrue(NonBlockingLock.objects.is_locked(self.user))
         l.release()
@@ -47,6 +49,8 @@ def test_obj_with_expired_lock_is_not_locked(self):
 
     def test_acquire_and_renew(self):
         ''' Tests an aquire/renew cycle '''
+        self.assertRaises(NonexistentLock, NonBlockingLock.objects.renew_lock, 0)
+
         with freeze_time("2015-01-01 10:00"):
             l = NonBlockingLock.objects.acquire_lock(self.user)
             expires = l.expires_on
@@ -129,6 +133,8 @@ def test_clean_locks(self):
         with freeze_time("2015-01-01 10:00"):
             NonBlockingLock.objects.acquire_lock(self.user, max_age=1)
 
+        self.assertEqual(1, NonBlockingLock.objects.get_expired_locks().count())
+        call_command('clean_expired_locks', dry_run=True)
         self.assertEqual(1, NonBlockingLock.objects.get_expired_locks().count())
         call_command('clean_expired_locks')
         self.assertEqual(0, NonBlockingLock.objects.get_expired_locks().count())