remove sleeps from node tests, test for databag on layer:scale operations

Author: Gabriel Monroy

api/tests/layer.py

@@ -111,6 +111,10 @@ def test_layer_scale(self):
         body = {'proxy': 2, 'runtime': 4}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
+        self.assertIn('nodes', response.data)
+        self.assertIn('containers', response.data)
+        self.assertIn('proxy', response.data)
+        self.assertIn('release', response.data)
         url = '/api/formations/{formation_id}/nodes'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -119,6 +123,11 @@ def test_layer_scale(self):
         url = '/api/formations/{formation_id}/scale/layers'.format(**locals())
         body = {'proxy': 1, 'runtime': 2}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 200)
+        self.assertIn('nodes', response.data)
+        self.assertIn('containers', response.data)
+        self.assertIn('proxy', response.data)
+        self.assertIn('release', response.data)
         url = '/api/formations/{formation_id}/nodes'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -128,6 +137,10 @@ def test_layer_scale(self):
         body = {'proxy': 0, 'runtime': 0}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 200)
+        self.assertIn('nodes', response.data)
+        self.assertIn('containers', response.data)
+        self.assertIn('proxy', response.data)
+        self.assertIn('release', response.data)
         url = '/api/formations/{formation_id}/nodes'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)

celerytasks/mock.py

@@ -1,8 +1,6 @@
 
 from __future__ import unicode_literals
 
-import time
-
 from api.models import Node
 from celery import task
 
@@ -25,7 +23,6 @@ def launch_node(node_id, creds, params, init, ssh_username, ssh_private_key):
     node.provider_id = 'i-1234567'
     node.metadata = {'state': 'running'}
     node.fqdn = 'localhost.localdomain.local'
-    time.sleep(1)
     node.save()
 
 
@@ -35,13 +32,11 @@ def terminate_node(node_id, creds, params, provider_id):
     node.metadata = {'state': 'terminated'}
     node.save()
     # delete the node itself from the database
-    time.sleep(1)
     node.delete()
 
 
 @task(name='mock.converge_node')
 def converge_node(node_id, ssh_username, fqdn, ssh_private_key):
     output = ""
     rc = 0
-    time.sleep(1)
     return output, rc