Fix core tests

amonapp · Jan 7, 2017 · 14007df · 14007df
1 parent 0c86f49
commit 14007df
Showing 1 changed file with 19 additions and 67 deletions.
diff --git a/amon/apps/api/tests/core_test.py b/amon/apps/api/tests/core_test.py
@@ -4,12 +4,10 @@
 from django.test.client import Client
 from django.test import TestCase
 from django.core.urlresolvers import reverse
-from django.conf import settings
-
-
 from django.contrib.auth import get_user_model
 User = get_user_model()
-from amon.apps.servers.models import server_model, cloud_server_model
+
+from amon.apps.servers.models import server_model
 from amon.apps.system.models import system_model
 from amon.apps.processes.models import process_model
 from amon.apps.devices.models import interfaces_model, volumes_model
@@ -18,6 +16,7 @@
 
 from amon.apps.cloudservers.models import cloud_credentials_model
 
+
 class TestCoreApi(TestCase):
 
     def setUp(self):
@@ -46,12 +45,12 @@ def test_with_user_data(self):
 
         alerts_model.add_initial_data()
 
-        THIS_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
-        JSON = os.path.join(THIS_DIRECTORY, 'agentdata.json')
-        data = open(JSON).read()
+        current_directory = os.path.abspath(os.path.dirname(__file__))
+        agentdata = os.path.join(current_directory, 'agentdata.json')
+        data = open(agentdata).read()
 
         url = reverse('api_system')
-        response = self.c.post(url,data, content_type='application/json')
+        response = self.c.post(url, data, content_type='application/json')
 
         assert server_model.collection.find().count() == 1
         assert system_model.data_collection.find().count() == 1
@@ -112,59 +111,12 @@ def test_get_or_create_server_view(self):
         assert server['key'] == '25e1f5e7b26240109d199892e468d529'
         assert server['instance_id'] == '100'
 
-
-        data = {"access_key": settings.AMAZON_ACCESS_KEY, "secret_key": settings.AMAZON_SECRET_KEY, "regions": 'eu-west-1'}
-        credentials_id = cloud_credentials_model.save(data=data, provider_id='amazon')
-        valid_credentials = cloud_credentials_model.get_by_id(credentials_id)
-
-        # Synced cloud server
-        self._cleanup()
-        instance = {
-            'name': 'test',
-            'instance_id': "100",
-            'provider': "amazon",
-            'credentials_id': credentials_id,
-            'credentials': 'production',
-            'region': 'eu-west1',
-            'type': 't1-micro',
-            'key': 'testserver-key'}
-
-        instance_list = []
-        instance_list.append(instance)
-        cloud_server_model.save(instances=instance_list, credentials=valid_credentials)
-
-        assert server_model.collection.find().count() == 1
-
-        data = {"host": {
-            "host": "debian-jessie",
-            "machineid": "25e1f5e7b26240109d199892e468d529",
-            "server_key": "",
-            "distro": {
-                "version": "8.2",
-                "name": "debian"
-            },
-            "ip_address": "10.0.2.15",
-            "instance_id": "100"
-        }}
-
-        url = reverse('api_system')
-        self.c.post(url, json.dumps(data), content_type='application/json')
-
-        assert server_model.collection.find().count() == 1
-
-        server = server_model.collection.find_one()
-
-        assert server['name'] == 'test'
-        assert server['key'] == '25e1f5e7b26240109d199892e468d529'
-        assert server['instance_id'] == '100'
-
-
     def test_system_data_view(self):
         self._cleanup()
 
-        THIS_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
-        JSON = os.path.join(THIS_DIRECTORY, 'agentdata.json')
-        data = open(JSON).read()
+        current_directory = os.path.abspath(os.path.dirname(__file__))
+        agentdata = os.path.join(current_directory, 'agentdata.json')
+        data = open(agentdata).read()
 
         url = reverse('api_system')
         self.c.post(url, data, content_type='application/json')
@@ -177,15 +129,15 @@ def test_system_data_view(self):
         assert plugin_model.collection.find().count() == 1
 
 
-    # def stress_test_system_data_view(self):
-    #     self._cleanup()
+    def stress_test_system_data_view(self):
+        self._cleanup()
 
-    #     THIS_DIRECTORY = os.path.abspath(os.path.dirname(__file__))
-    #     JSON = os.path.join(THIS_DIRECTORY, 'agentdata.json')
-    #     data = open(JSON).read()
+        current_directory = os.path.abspath(os.path.dirname(__file__))
+        agentdata = os.path.join(current_directory, 'agentdata.json')
+        data = open(agentdata).read()
 
-    #     url = reverse('api_system')
-    #     for i in range(10):
-    #         self.c.post(url, data, content_type='application/json')
+        url = reverse('api_system')
+        for i in range(10):
+            self.c.post(url, data, content_type='application/json')
 
-    #     assert server_model.collection.find().count() == 1
+        assert server_model.collection.find().count() == 1