WIP

autopush/tests/test_integration.py

@@ -212,7 +212,7 @@ def send_notification(self, channel=None, version=None, data=None,
             if use_header:
                 headers.update({
                     "Content-Type": "application/octet-stream",
-                    "Content-Encoding": "aesgcm-128",
+                    "Content-Encoding": "aesgcm",
                     "Encryption": self._crypto_key,
                     "Crypto-Key": 'keyid="a1"; dh="JcqK-OLkJZlJ3sJJWstJCA"',
                 })

autopush/tests/test_web_validation.py

@@ -150,7 +150,7 @@ def check_result(result):
 
 class TestSimplePushRequestSchema(unittest.TestCase):
     def _make_fut(self):
-        from autopush.web.push_validation import SimplePushRequestSchema
+        from autopush.web.simplepush import SimplePushRequestSchema
         schema = SimplePushRequestSchema()
         schema.context["settings"] = Mock()
         schema.context["log"] = Mock()
@@ -283,7 +283,7 @@ def test_invalid_data_size(self):
 
 class TestWebPushRequestSchema(unittest.TestCase):
     def _make_fut(self):
-        from autopush.web.push_validation import WebPushRequestSchema
+        from autopush.web.webpush import WebPushRequestSchema
         schema = WebPushRequestSchema()
         schema.context["settings"] = Mock()
         schema.context["log"] = Mock()
@@ -565,7 +565,7 @@ def test_invalid_topic(self):
 
 class TestWebPushRequestSchemaUsingVapid(unittest.TestCase):
     def _make_fut(self):
-        from autopush.web.push_validation import WebPushRequestSchema
+        from autopush.web.webpush import WebPushRequestSchema
         from autopush.settings import AutopushSettings
         schema = WebPushRequestSchema()
         schema.context["log"] = Mock()
@@ -659,7 +659,7 @@ def test_valid_vapid_crypto_header_webpush(self):
         eq_(errors, {})
         ok_("jwt" in result)
 
-    @patch("autopush.web.push_validation.extract_jwt")
+    @patch("autopush.web.webpush.extract_jwt")
     def test_invalid_vapid_crypto_header(self, mock_jwt):
         schema = self._make_fut()
         mock_jwt.side_effect = ValueError("Unknown public key "
@@ -695,7 +695,7 @@ def test_invalid_vapid_crypto_header(self, mock_jwt):
         eq_(cm.exception.status_code, 401)
         eq_(cm.exception.errno, 109)
 
-    @patch("autopush.web.push_validation.extract_jwt")
+    @patch("autopush.web.webpush.extract_jwt")
     def test_invalid_encryption_header(self, mock_jwt):
         schema = self._make_fut()
         mock_jwt.side_effect = ValueError("Unknown public key "
@@ -731,7 +731,7 @@ def test_invalid_encryption_header(self, mock_jwt):
         eq_(cm.exception.status_code, 401)
         eq_(cm.exception.errno, 110)
 
-    @patch("autopush.web.push_validation.extract_jwt")
+    @patch("autopush.web.webpush.extract_jwt")
     def test_invalid_encryption_jwt(self, mock_jwt):
         schema = self._make_fut()
         # use a deeply superclassed error to make sure that it gets picked up.
@@ -767,7 +767,7 @@ def test_invalid_encryption_jwt(self, mock_jwt):
         eq_(cm.exception.status_code, 401)
         eq_(cm.exception.errno, 109)
 
-    @patch("autopush.web.push_validation.extract_jwt")
+    @patch("autopush.web.webpush.extract_jwt")
     def test_invalid_crypto_key_header_content(self, mock_jwt):
         schema = self._make_fut()
         mock_jwt.side_effect = ValueError("Unknown public key "