feat: move tests to pytest

Issue #1039

.coveragerc

@@ -5,4 +5,5 @@ omit =
     autopush/gcdump.py
     autopush/webpush_server.py
     autopush/tests/test_webpush_server.py
+    autopush/conftest.py
 show_missing = true

Makefile

@@ -4,6 +4,10 @@ DEPS =
 HERE = $(shell pwd)
 PTYPE=pypy
 REQS=requirements.txt
+TESTER=nose
+NOSE_ARGS=--with-coverage --cover-package=autopush
+PYTEST_ARGS=--cov=autopush --cov-report=xml
+TEST_ARGS=$($(shell echo $(TESTER) | tr a-z A-Z)_ARGS)
 ifneq ($(PTYPE), python)
     # avoids pycrypto build issues w/ pypy + libgmp-dev or libmpir-dev
     export with_gmp=no
@@ -19,7 +23,7 @@ BUILD_DIRS = bin build deps include lib lib64 lib_pypy lib-python\
 	src site-packages .tox .eggs .coverage
 
 
-.PHONY: all build test coverage lint clean clean-env
+.PHONY: all build test coverage lint clean clean-env foo
 
 all:	build
 
@@ -63,7 +67,7 @@ test: $(BIN)/tox ddb
 	$(BIN)/tox
 
 coverage: $(BIN)/tox
-	$(BIN)/tox -- --with-coverage --cover-package=autopush
+	$(BIN)/tox -- $(TEST_ARGS)
 
 lint: $(BIN)/flake8
 	$(BIN)/flake8 autopush

autopush/conftest.py

@@ -0,0 +1,11 @@
+from autopush.tests import setUp, tearDown
+
+
+def pytest_configure(config):
+    """Called before testing begins"""
+    setUp()
+
+
+def pytest_unconfigure(config):
+    """Called after all tests run and warnings displayed"""
+    tearDown()

autopush/db.py

@@ -504,7 +504,7 @@ def fetch_messages(
     def fetch_timestamp_messages(
             self,
             uaid,  # type: uuid.UUID
-            timestamp=None,  # type: Optional[int]
+            timestamp=None,  # type: Optional[int or str]
             limit=10,  # type: int
             ):
         # type: (...) -> Tuple[Optional[int], List[WebPushNotification]]

autopush/tests/test_cryptokey.py

@@ -1,6 +1,6 @@
 import unittest
 
-from nose.tools import (eq_, ok_, assert_raises)
+import pytest
 
 from autopush.crypto_key import CryptoKey, CryptoKeyException
 
@@ -15,47 +15,47 @@ class CryptoKeyTestCase(unittest.TestCase):
 
     def test_parse(self):
         ckey = CryptoKey(self.valid_key)
-        eq_(ckey.get_keyid("p256dh"),
-            {"keyid": "p256dh",
-             "dh": "BDw9T0eImd4ax818VcYqDK_DOhcuDswKero"
-                   "YyNkdhYmygoLSDlSiWpuoWYUSSFxi25cyyNTR5k9Ny93DzZc0UI4"})
-        eq_(ckey.get_label("p256ecdsa"),
+        assert ckey.get_keyid("p256dh") == {
+            "keyid": "p256dh",
+            "dh": "BDw9T0eImd4ax818VcYqDK_DOhcuDswKero"
+                  "YyNkdhYmygoLSDlSiWpuoWYUSSFxi25cyyNTR5k9Ny93DzZc0UI4"}
+        assert ckey.get_label("p256ecdsa") == (
             "BF92zdI_AKcH5Q31_Rr-04bPqOHU_Qg6lAawHbvfQrY"
             "xV_vIsAsHSyaiuyfofvxT8ZVIXccykd4V2Z7iJVfreT8")
-        ok_(ckey.get_keyid("missing") is None)
-        ok_(ckey.get_label("missing") is None)
+        assert ckey.get_keyid("missing") is None
+        assert ckey.get_label("missing") is None
 
     def test_parse_and_get_label(self):
-        eq_(CryptoKey.parse_and_get_label(self.valid_key, "p256ecdsa"),
+        assert CryptoKey.parse_and_get_label(self.valid_key, "p256ecdsa") == (
             "BF92zdI_AKcH5Q31_Rr-04bPqOHU_Qg6lAawHbvfQrY"
             "xV_vIsAsHSyaiuyfofvxT8ZVIXccykd4V2Z7iJVfreT8")
-        ok_(CryptoKey.parse_and_get_label(self.valid_key, "missing") is None)
-        ok_(CryptoKey.parse_and_get_label("invalid key", "missing") is None)
+        assert CryptoKey.parse_and_get_label(self.valid_key, "missing") is None
+        assert CryptoKey.parse_and_get_label("invalid key", "missing") is None
 
     def test_parse_invalid(self):
-        with assert_raises(CryptoKeyException) as ex:
+        with pytest.raises(CryptoKeyException) as ex:
             CryptoKey("invalid key")
-        eq_(ex.exception.message, "Invalid Crypto Key value")
+        assert ex.value.message == "Invalid Crypto Key value"
 
     def test_parse_different_order(self):
         ckey = CryptoKey(self.valid_key)
         ckey2 = CryptoKey(','.join(self.valid_key.split(',')[::-1]))
-        ok_(ckey.get_keyid("p256dh"), ckey2.get_keyid("p256dh"))
-        ok_(ckey.get_label("p256ecdsa") is not None)
-        ok_(ckey.get_label("p256ecdsa"), ckey2.get_label("p256ecdsa"))
+        assert ckey.get_keyid("p256dh") == ckey2.get_keyid("p256dh")
+        assert ckey.get_label("p256ecdsa") is not None
+        assert ckey.get_label("p256ecdsa") == ckey2.get_label("p256ecdsa")
 
     def test_parse_lenient(self):
         ckey = CryptoKey(self.valid_key.replace('"', ''))
         str = ckey.to_string()
         ckey2 = CryptoKey(str)
-        ok_(ckey.get_keyid("p256dh"), ckey2.get_keyid("p256dh"))
-        ok_(ckey.get_label("p256ecdsa") is not None)
-        ok_(ckey.get_label("p256ecdsa"), ckey2.get_label("p256ecdsa"))
+        assert ckey.get_keyid("p256dh") == ckey2.get_keyid("p256dh")
+        assert ckey.get_label("p256ecdsa") is not None
+        assert ckey.get_label("p256ecdsa") == ckey2.get_label("p256ecdsa")
 
     def test_string(self):
         ckey = CryptoKey(self.valid_key)
         str = ckey.to_string()
         ckey2 = CryptoKey(str)
-        ok_(ckey.get_keyid("p256dh"), ckey2.get_keyid("p256dh"))
-        ok_(ckey.get_label("p256ecdsa") is not None)
-        ok_(ckey.get_label("p256ecdsa"), ckey2.get_label("p256ecdsa"))
+        assert ckey.get_keyid("p256dh") == ckey2.get_keyid("p256dh")
+        assert ckey.get_label("p256ecdsa") is not None
+        assert ckey.get_label("p256ecdsa") == ckey2.get_label("p256ecdsa")