feat: remove use of moto dynamodb2 from tests

Moves the local DynamoDB run to the package level and all tests use
it instead of running moto's incomplete dynamodb mock.

This also fixes a bug in the tests that left autopush.db.key_hash
set after an endpoint test ran.

autopush/tests/__init__.py

@@ -1,3 +1,56 @@
+import logging
+import os
+import signal
+import subprocess
+
+import boto
+import psutil
+
+from autopush.db import create_rotating_message_table
+
+here_dir = os.path.abspath(os.path.dirname(__file__))
+root_dir = os.path.dirname(os.path.dirname(here_dir))
+ddb_dir = os.path.join(root_dir, "ddb")
+ddb_lib_dir = os.path.join(ddb_dir, "DynamoDBLocal_lib")
+ddb_jar = os.path.join(ddb_dir, "DynamoDBLocal.jar")
+ddb_process = None
+
+
+def setUp():
+    logging.getLogger('boto').setLevel(logging.CRITICAL)
+    boto_path = os.path.join(root_dir, "automock", "boto.cfg")
+    boto.config.load_from_path(boto_path)
+    global ddb_process
+    cmd = " ".join([
+        "java", "-Djava.library.path=%s" % ddb_lib_dir,
+        "-jar", ddb_jar, "-sharedDb", "-inMemory"
+    ])
+    ddb_process = subprocess.Popen(cmd, shell=True, env=os.environ)
+
+    # Setup the necessary message tables
+    message_table = os.environ.get("MESSAGE_TABLE", "message_int_test")
+    create_rotating_message_table(prefix=message_table, delta=-1)
+    create_rotating_message_table(prefix=message_table)
+
+
+def tearDown():
+    global ddb_process
+    # This kinda sucks, but its the only way to nuke the child procs
+    proc = psutil.Process(pid=ddb_process.pid)
+    child_procs = proc.children(recursive=True)
+    for p in [proc] + child_procs:
+        os.kill(p.pid, signal.SIGTERM)
+    ddb_process.wait()
+
+    # Clear out the boto config that was loaded so the rest of the tests run
+    # fine
+    for section in boto.config.sections():
+        boto.config.remove_section(section)
+
+
+_multiprocess_shared_ = True
+
+
 class MockAssist(object):
     def __init__(self, results):
         self.cur = 0

autopush/tests/test_db.py

@@ -35,16 +35,6 @@
 dummy_chid = str(uuid.UUID("deadbeef00000000decafbad00000000"))
 
 
-def setUp():
-    from .test_integration import setUp
-    setUp()
-
-
-def tearDown():
-    from .test_integration import tearDown
-    tearDown()
-
-
 def make_webpush_notification(uaid, chid, ttl=100):
     message_id = str(uuid.uuid4())
     return WebPushNotification(

autopush/tests/test_diagnostic_cli.py

@@ -1,21 +1,9 @@
 import unittest
 
 from mock import Mock, patch
-from moto import mock_dynamodb2
 from nose.tools import eq_, ok_
 
 
-mock_dynamodb2 = mock_dynamodb2()
-
-
-def setUp():
-    mock_dynamodb2.start()
-
-
-def tearDown():
-    mock_dynamodb2.stop()
-
-
 class FakeDict(dict):
     pass
 

autopush/tests/test_endpoint.py

@@ -14,7 +14,6 @@
     ProvisionedThroughputExceededException,
     Message,
     ItemNotFound,
-    create_rotating_message_table,
     has_connected_this_month,
 )
 from autopush.exceptions import RouterException
@@ -37,17 +36,6 @@
 dummy_token = dummy_uaid.hex + ":" + str(dummy_chid)
 
 
-def setUp():
-    from .test_integration import setUp
-    setUp()
-    create_rotating_message_table()
-
-
-def tearDown():
-    from .test_integration import tearDown
-    tearDown()
-
-
 class FileConsumer(object):  # pragma: no cover
     def __init__(self, fileObj):
         self.file = fileObj

autopush/tests/test_health.py

@@ -3,7 +3,6 @@
 import twisted.internet.base
 from boto.dynamodb2.exceptions import InternalServerError
 from mock import Mock
-from moto import mock_dynamodb2
 from nose.tools import eq_
 from twisted.internet.defer import inlineCallbacks
 from twisted.logger import globalLogPublisher
@@ -25,10 +24,6 @@ def setUp(self):
         self.timeout = 0.5
         twisted.internet.base.DelayedCall.debug = True
 
-        self.mock_dynamodb2 = mock_dynamodb2()
-        self.mock_dynamodb2.start()
-        self.addCleanup(self.mock_dynamodb2.stop)
-
         settings = AutopushSettings(
             hostname="localhost",
             statsd_host=None,

autopush/tests/test_integration.py

@@ -3,8 +3,6 @@
 import logging
 import os
 import random
-import signal
-import subprocess
 import sys
 import time
 import urlparse
@@ -18,9 +16,7 @@
 
 from zope.interface import implementer
 
-import boto
 import ecdsa
-import psutil
 import twisted.internet.base
 import websocket
 from cryptography.fernet import Fernet
@@ -39,7 +35,6 @@
 import autopush.db as db
 from autopush import __version__
 from autopush.db import (
-    create_rotating_message_table,
     get_month,
     has_connected_this_month
 )
@@ -52,48 +47,14 @@
 from autopush.websocket import PushServerFactory
 
 log = logging.getLogger(__name__)
-here_dir = os.path.abspath(os.path.dirname(__file__))
-root_dir = os.path.dirname(os.path.dirname(here_dir))
-ddb_dir = os.path.join(root_dir, "ddb")
-ddb_lib_dir = os.path.join(ddb_dir, "DynamoDBLocal_lib")
-ddb_jar = os.path.join(ddb_dir, "DynamoDBLocal.jar")
-ddb_process = None
 
 twisted.internet.base.DelayedCall.debug = True
 
 
 def setUp():
     logging.getLogger('boto').setLevel(logging.CRITICAL)
-    boto_path = os.path.join(root_dir, "automock", "boto.cfg")
-    boto.config.load_from_path(boto_path)
     if "SKIP_INTEGRATION" in os.environ:  # pragma: nocover
         raise SkipTest("Skipping integration tests")
-    global ddb_process
-    cmd = " ".join([
-        "java", "-Djava.library.path=%s" % ddb_lib_dir,
-        "-jar", ddb_jar, "-sharedDb", "-inMemory"
-    ])
-    ddb_process = subprocess.Popen(cmd, shell=True, env=os.environ)
-
-    # Setup the necessary message tables
-    message_table = os.environ.get("MESSAGE_TABLE", "message_int_test")
-    create_rotating_message_table(prefix=message_table, delta=-1)
-    create_rotating_message_table(prefix=message_table)
-
-
-def tearDown():
-    global ddb_process
-    # This kinda sucks, but its the only way to nuke the child procs
-    proc = psutil.Process(pid=ddb_process.pid)
-    child_procs = proc.children(recursive=True)
-    for p in [proc] + child_procs:
-        os.kill(p.pid, signal.SIGTERM)
-    ddb_process.wait()
-
-    # Clear out the boto config that was loaded so the rest of the tests run
-    # fine
-    for section in boto.config.sections():
-        boto.config.remove_section(section)
 
 
 def _get_vapid(key=None, payload=None):

autopush/tests/test_main.py

@@ -3,7 +3,6 @@
 import json
 
 from mock import Mock, patch
-from moto import mock_dynamodb2
 from nose.tools import (
     assert_raises,
     eq_,
@@ -14,6 +13,7 @@
 import hyper
 import hyper.tls
 
+import autopush.db
 from autopush.db import DatabaseManager, get_rotating_message_table
 from autopush.exceptions import InvalidSettings
 from autopush.http import skip_request_logging
@@ -27,15 +27,6 @@
 
 connection_main = ConnectionApplication.main
 endpoint_main = EndpointApplication.main
-mock_dynamodb2 = mock_dynamodb2()
-
-
-def setUp():
-    mock_dynamodb2.start()
-
-
-def tearDown():
-    mock_dynamodb2.stop()
 
 
 class SettingsTestCase(unittest.TestCase):
@@ -292,6 +283,7 @@ def setUp(self):
     def tearDown(self):
         for mock in self.mocks.values():
             mock.stop()
+        autopush.db.key_hash = ""
 
     def test_basic(self):
         endpoint_main([

autopush/tests/test_router.py

@@ -7,7 +7,6 @@
 
 from autopush.utils import WebPushNotification
 from mock import Mock, PropertyMock, patch
-from moto import mock_dynamodb2
 from nose.tools import eq_, ok_, assert_raises
 from twisted.trial import unittest
 from twisted.internet.error import ConnectError, ConnectionRefusedError
@@ -24,7 +23,6 @@
     Message,
     ProvisionedThroughputExceededException,
     ItemNotFound,
-    create_rotating_message_table,
 )
 from autopush.exceptions import RouterException
 from autopush.metrics import SinkMetrics
@@ -42,18 +40,6 @@
 from autopush.web.base import Notification
 
 
-mock_dynamodb2 = mock_dynamodb2()
-
-
-def setUp():
-    mock_dynamodb2.start()
-    create_rotating_message_table()
-
-
-def tearDown():
-    mock_dynamodb2.stop()
-
-
 class RouterInterfaceTestCase(TestCase):
     def test_not_implemented(self):
         assert_raises(NotImplementedError, IRouter, None, None)

autopush/tests/test_utils.py

@@ -39,6 +39,15 @@ def test_trusted_vapid(self):
         data = extract_jwt(vapid_info['auth'], 'invalid_key', is_trusted=True)
         eq_(data['sub'], 'mailto:foo@example.com')
 
+    @patch("requests.get")
+    def test_get_amid_unknown(self, request_mock):
+        import requests
+        from autopush.utils import get_amid
+
+        request_mock.side_effect = requests.HTTPError
+        result = get_amid()
+        eq_(result, "Unknown")
+
     @patch("requests.get")
     def test_get_ec2_instance_id_unknown(self, request_mock):
         import requests

autopush/tests/test_web_validation.py

@@ -12,12 +12,10 @@
 from jose import jws
 from marshmallow import Schema, fields
 from mock import Mock, patch
-from moto import mock_dynamodb2
 from nose.tools import eq_, ok_, assert_raises
 from twisted.internet.defer import inlineCallbacks
 from twisted.trial import unittest
 
-from autopush.db import create_rotating_message_table
 from autopush.metrics import SinkMetrics
 from autopush.exceptions import InvalidRequest, InvalidTokenException
 from autopush.tests.support import test_db
@@ -27,16 +25,6 @@
 dummy_uaid = str(uuid.UUID("abad1dea00000000aabbccdd00000000"))
 dummy_chid = str(uuid.UUID("deadbeef00000000decafbad00000000"))
 dummy_token = dummy_uaid + ":" + dummy_chid
-mock_dynamodb2 = mock_dynamodb2()
-
-
-def setUp():
-    mock_dynamodb2.start()
-    create_rotating_message_table()
-
-
-def tearDown():
-    mock_dynamodb2.stop()
 
 
 class InvalidSchema(Schema):

autopush/tests/test_web_webpush.py

@@ -3,12 +3,11 @@
 
 from cryptography.fernet import Fernet
 from mock import Mock
-from moto import mock_dynamodb2
 from nose.tools import eq_, ok_
 from twisted.internet.defer import inlineCallbacks
 from twisted.trial import unittest
 
-from autopush.db import Message, create_rotating_message_table
+from autopush.db import Message
 from autopush.http import EndpointHTTPFactory
 from autopush.router.interface import IRouter, RouterResponse
 from autopush.settings import AutopushSettings
@@ -18,16 +17,6 @@
 dummy_uaid = str(uuid.UUID("abad1dea00000000aabbccdd00000000"))
 dummy_chid = str(uuid.UUID("deadbeef00000000decafbad00000000"))
 dummy_token = dummy_uaid + ":" + dummy_chid
-mock_dynamodb2 = mock_dynamodb2()
-
-
-def setUp():
-    mock_dynamodb2.start()
-    create_rotating_message_table()
-
-
-def tearDown():
-    mock_dynamodb2.stop()
 
 
 class TestWebpushHandler(unittest.TestCase):