Fix tests.

mozilla-services · Oct 26, 2016 · a482105 · a482105
1 parent e2c1189
commit a482105
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/kinto_amo/__init__.py b/kinto_amo/__init__.py
@@ -40,9 +40,9 @@ def includeme(config):
         resource[blocklist] = parse_resource(settings_value)
 
     for resource in resources.values():
-        diff = set(resource.keys()) - {'addons', 'plugins', 'gfx', 'certificates'}
-        if len(diff) != 0:
-            raise ConfigurationError("Invalid blocklist: %s" % diff)
+        inter = set(resource.keys()) & {'addons', 'plugins', 'gfx', 'certificates'}
+        if len(inter) != 4:
+            raise ConfigurationError("Invalid blocklist: %s" % inter)
 
     config.registry.amo_resources = resources
 

diff --git a/kinto_amo/tests/support.py b/kinto_amo/tests/support.py
@@ -22,4 +22,6 @@ def get_app_settings(self, extras=None):
         config = configparser.ConfigParser()
         config.read(ini_path)
         settings = dict(config.items('app:main'))
+        if extras:
+            settings.update(extras)
         return settings
diff --git a/kinto_amo/tests/test_views.py b/kinto_amo/tests/test_views.py
@@ -2,8 +2,6 @@
 import mock
 import os
 import pytest
-import unittest
-import webtest
 import xml.etree.ElementTree as ET
 
 from amo2kinto import constants