ref(controller): remove REGISTRY_MODULE hack

Author: mboersma

controller/api/models.py

@@ -867,8 +867,7 @@ def publish(self, source_version='latest'):
         source_tag = 'git-{}'.format(self.build.sha) if self.build.sha else source_version
         source_image = '{}:{}'.format(self.build.image, source_tag)
         # IOW, this image did not come from the builder
-        # FIXME: remove check for mock registry module
-        if not self.build.sha and 'mock' not in settings.REGISTRY_MODULE:
+        if not self.build.sha:
             # we assume that the image is not present on our registry,
             # so shell out a task to pull in the repository
             data = {

controller/api/tests/test_build.py

@@ -7,11 +7,11 @@
 from __future__ import unicode_literals
 
 import json
-import mock
 import requests
 
 from django.contrib.auth.models import User
 from django.test import TransactionTestCase
+import mock
 from rest_framework.authtoken.models import Token
 
 from api.models import Build
@@ -24,6 +24,7 @@ def mock_import_repository_task(*args, **kwargs):
     return resp
 
 
+@mock.patch('api.models.publish_release', lambda *args: None)
 class BuildTest(TransactionTestCase):
 
     """Tests build notification from build system"""

controller/api/tests/test_config.py

@@ -9,12 +9,12 @@
 
 import json
 import logging
-import mock
 import requests
 
 from django.contrib.auth.models import User
 from django.test import TransactionTestCase
 import etcd
+import mock
 from rest_framework.authtoken.models import Token
 
 import api.exceptions
@@ -52,6 +52,7 @@ def get(self, key, *args, **kwargs):
         return etcd.EtcdResult(None, node)
 
 
+@mock.patch('api.models.publish_release', lambda *args: None)
 class ConfigTest(TransactionTestCase):
 
     """Tests setting and updating config values"""

controller/api/tests/test_container.py

@@ -7,15 +7,15 @@
 from __future__ import unicode_literals
 
 import json
-import mock
 import requests
 
 from django.contrib.auth.models import User
 from django.test import TransactionTestCase
-from scheduler.states import TransitionError
+import mock
 from rest_framework.authtoken.models import Token
 
 from api.models import App, Build, Container, Release
+from scheduler.states import TransitionError
 
 
 def mock_import_repository_task(*args, **kwargs):
@@ -25,6 +25,7 @@ def mock_import_repository_task(*args, **kwargs):
     return resp
 
 
+@mock.patch('api.models.publish_release', lambda *args: None)
 class ContainerTest(TransactionTestCase):
     """Tests creation of containers on nodes"""
 

controller/api/tests/test_hooks.py

@@ -7,12 +7,12 @@
 from __future__ import unicode_literals
 
 import json
-import mock
 import requests
 
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.test import TransactionTestCase
+import mock
 from rest_framework.authtoken.models import Token
 
 
@@ -23,6 +23,7 @@ def mock_import_repository_task(*args, **kwargs):
     return resp
 
 
+@mock.patch('api.models.publish_release', lambda *args: None)
 class HookTest(TransactionTestCase):
 
     """Tests API hooks used to trigger actions from external components"""

controller/api/tests/test_release.py

@@ -7,11 +7,11 @@
 from __future__ import unicode_literals
 
 import json
-import mock
 import requests
 
 from django.contrib.auth.models import User
 from django.test import TransactionTestCase
+import mock
 from rest_framework.authtoken.models import Token
 
 from api.models import Release
@@ -24,6 +24,7 @@ def mock_import_repository_task(*args, **kwargs):
     return resp
 
 
+@mock.patch('api.models.publish_release', lambda *args: None)
 class ReleaseTest(TransactionTestCase):
 
     """Tests push notification from build system"""

controller/api/tests/test_scheduler.py

@@ -11,11 +11,13 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.test import TransactionTestCase
+import mock
 from rest_framework.authtoken.models import Token
 
 from scheduler import chaos
 
 
+@mock.patch('api.models.publish_release', lambda *args: None)
 class SchedulerTest(TransactionTestCase):
     """Tests creation of containers on nodes"""
 

controller/deis/settings.py

@@ -303,7 +303,6 @@
 BUILDER_KEY = os.environ.get('DEIS_BUILDER_KEY', 'CHANGEME_sapm$s%upvsw5l_zuy_&29rkywd^78ff(qi')
 
 # registry settings
-REGISTRY_MODULE = 'registry.mock'
 REGISTRY_URL = 'http://localhost:5000'
 REGISTRY_HOST = 'localhost'
 REGISTRY_PORT = 5000

controller/registry/__init__.py

@@ -1,9 +1 @@
-import importlib
-
-from django.conf import settings
-
-# import the registry module specified in settings
-_registry_module = importlib.import_module(settings.REGISTRY_MODULE)
-
-# expose the publish_release method publicly
-publish_release = _registry_module.publish_release
+from private import publish_release  # noqa