Change references.

Author: RomanDzhabarov

__init__.py

@@ -5,7 +5,7 @@
 from flask import request
 from flask.ext.restful import Resource
 
-from app.stats import get_stats
+from ..stats import get_stats
 from .. import settings
 from ..services import host
 from ..models.host import Host

app/resources/api.py

@@ -6,7 +6,7 @@
 from flask import current_app as app
 from flask import request
 
-from app.stats import get_stats
+from ..stats import get_stats
 from .. import settings
 from ..models.host import Host
 

app/services/host.py

@@ -1,4 +1,4 @@
-from app.models.host import Host
+from discovery.app.models.host import Host
 
 
 def setup():

tests/unit/app/__init__.py

@@ -1,10 +1,10 @@
 import unittest
 from flask import Flask
 from flask.ext.cache import Cache
-from app.resources.api import RepoRegistration, Registration
+from discovery.app.models import Host
+from discovery.app.resources.api import RepoRegistration, Registration
 from mock import patch
 from mock import Mock
-from app.models.host import Host
 
 
 class ApiResourceTestCase(unittest.TestCase):
@@ -44,7 +44,7 @@ def test_get_no_hosts(self):
         assert response_code == 200
         assert response == expected
 
-    @patch('app.services.host.HostService.list')
+    @patch('discovery.app.services.host.HostService.list')
     def test_get_with_hosts(self, get_hosts):
         expected_hosts = [
             {
@@ -95,7 +95,7 @@ def test_get_service_repo_name_no_hosts(self):
         assert response_code == 200
         assert response == expected
 
-    @patch('app.services.host.HostService.list_by_service_repo_name')
+    @patch('discovery.app.services.host.HostService.list_by_service_repo_name')
     def test_get_service_repo_name_with_hosts(self, get_hosts):
         expected_hosts = [
             {
@@ -136,7 +136,7 @@ def test_get_service_repo_name_with_hosts(self, get_hosts):
         assert response_code == 200
         assert response == expected
 
-    @patch('app.resources.api.Registration._get_param')
+    @patch('discovery.app.resources.api.Registration._get_param')
     def test_post_invalid_params(self, get_param):
         get_param.return_value = '0'
         registration = Registration()

tests/unit/app/api_test.py

@@ -1,9 +1,8 @@
 import unittest
 import json
 
-import app
-import app.routes.api
-from app.models.host import Host
+from discovery import app
+from discovery.app.models.host import Host
 
 
 class FlaskResourceTestCase(unittest.TestCase):

tests/unit/app/flask_test.py

@@ -3,7 +3,7 @@
 from flask import Flask
 from flask.ext.cache import Cache
 from datetime import datetime, timedelta
-from app.services.host import HostService
+from discovery.app.services.host import HostService
 
 
 class HostServiceTestCase(unittest.TestCase):
@@ -21,8 +21,8 @@ def tearDown(self):
     def _generate_valid_tags(self):
         return {'az': 'foo', 'instance_id': 'bar', 'region': 'baz'}
 
-    @patch('app.models.host.Host.get')
-    @patch('app.models.host.Host.save')
+    @patch('discovery.app.models.host.Host.get')
+    @patch('discovery.app.models.host.Host.save')
     def test_update_succeeds(self, save, get):
         save.return_value = Mock(spec=bool)
         get.return_value = Mock(spec=['port', 'revision', 'last_check_in', 'tags', 'save'])
@@ -51,8 +51,8 @@ def test_service_repo_name_optional(self):
         )
         assert success is True
 
-    @patch('app.models.host.Host.get')
-    @patch('app.models.host.Host.save')
+    @patch('discovery.app.models.host.Host.get')
+    @patch('discovery.app.models.host.Host.save')
     def test_update_invalid_ip(self, save, get):
         save.return_value = Mock(spec=bool)
         get.return_value = Mock(spec=['port', 'revision', 'last_check_in', 'tags', 'save'])
@@ -78,8 +78,8 @@ def test_update_invalid_ip(self, save, get):
         )
         assert success is False
 
-    @patch('app.models.host.Host.get')
-    @patch('app.models.host.Host.save')
+    @patch('discovery.app.models.host.Host.get')
+    @patch('discovery.app.models.host.Host.save')
     def test_update_invalid_port(self, save, get):
         save.return_value = Mock(spec=bool)
         get.return_value = Mock(spec=['port', 'revision', 'last_check_in', 'tags', 'save'])
@@ -108,8 +108,8 @@ def test_update_invalid_port(self, save, get):
         )
         assert success is False
 
-    @patch('app.models.host.Host.get')
-    @patch('app.models.host.Host.save')
+    @patch('discovery.app.models.host.Host.get')
+    @patch('discovery.app.models.host.Host.save')
     def test_update_invalid_last_check_in(self, save, get):
         save.return_value = Mock(spec=bool)
         get.return_value = Mock(spec=['port', 'revision', 'last_check_in', 'tags', 'save'])
@@ -126,8 +126,8 @@ def test_update_invalid_last_check_in(self, save, get):
         )
         assert success is False
 
-    @patch('app.models.host.Host.get')
-    @patch('app.models.host.Host.save')
+    @patch('discovery.app.models.host.Host.get')
+    @patch('discovery.app.models.host.Host.save')
     def test_update_invalid_tags(self, save, get):
         save.return_value = Mock(spec=bool)
         get.return_value = Mock(spec=['port', 'revision', 'last_check_in', 'tags', 'save'])
@@ -168,8 +168,8 @@ def test_update_invalid_tags(self, save, get):
         )
         assert success is False
 
-    @patch('app.models.host.Host.query')
-    @patch('app.services.host.HostService._is_expired')
+    @patch('discovery.app.models.host.Host.query')
+    @patch('discovery.app.services.host.HostService._is_expired')
     def test_list(self, expired, query):
         self.app.cache = Cache(self.app, config={'CACHE_TYPE': 'null'})
         service = 'foo'
@@ -224,8 +224,8 @@ def test_list(self, expired, query):
         ]
         assert hosts == expected
 
-    @patch('app.models.host.Host.service_repo_name_index.query')
-    @patch('app.services.host.HostService._is_expired')
+    @patch('discovery.app.models.host.Host.service_repo_name_index.query')
+    @patch('discovery.app.services.host.HostService._is_expired')
     def test_list_by_service_repo_name(self, expired, query):
         self.app.cache = Cache(self.app, config={'CACHE_TYPE': 'null'})
         service = 'foo'
@@ -281,7 +281,7 @@ def test_list_by_service_repo_name(self, expired, query):
         ]
         assert hosts == expected
 
-    @patch('app.models.host.Host.get')
+    @patch('discovery.app.models.host.Host.get')
     def test_set_tag(self, get):
         host = Mock(spec=['port', 'revision', 'last_check_in', 'tags', 'save'])
         host.save.return_value = Mock(spec=bool)
@@ -299,8 +299,8 @@ def test_set_tag(self, get):
         assert host.tags == {'tagname': 'value'}
         host.save.assert_called_once()
 
-    @patch('app.models.host.Host.batch_write')
-    @patch('app.models.host.Host.query')
+    @patch('discovery.app.models.host.Host.batch_write')
+    @patch('discovery.app.models.host.Host.query')
     def test_set_tag_all(self, query, batch_write):
         enter = MagicMock()
         ctx_manager = MagicMock()
@@ -329,7 +329,7 @@ def test_set_tag_all(self, query, batch_write):
     def noop(self):
         pass
 
-    @patch('app.models.host.Host.query')
+    @patch('discovery.app.models.host.Host.query')
     def test_sweeper(self, query):
         # have query return hosts, some of which are expired
         # verify that the expired hosts are not returned