x/python-ganttclient
Code Issues Proposed changes

added tests for EC2 describe_instances

Browse Source
This commit is contained in:
Eldar Nugaev
2010-12-29 23:30:08 +03:00
parent 52407e54a8
commit 973cd35153
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/test_cloud.py
View File

@@ -62,7 +62,7 @@ class CloudTestCase(test.TestCase):
self.cloud = cloud.CloudController() self.cloud = cloud.CloudController()
# set up services # set up services
self.compute = service.Service.create(binary='nova-compute') self.compute = service.Service.create(binary='nova-compute', host='host1')
self.compute.start() self.compute.start()
self.network = service.Service.create(binary='nova-network') self.network = service.Service.create(binary='nova-network')
self.network.start() self.network.start()
@@ -228,6 +228,20 @@ class CloudTestCase(test.TestCase):
logging.debug("Terminating instance %s" % instance_id) logging.debug("Terminating instance %s" % instance_id)
rv = yield self.compute.terminate_instance(instance_id) rv = yield self.compute.terminate_instance(instance_id)
def test_describe_instances(self):
"""Makes sure describe_instances works."""
instance1 = db.instance_create(self.context, {'hostname': 'host2'})
service1 = db.service_create(self.context, {'host': 'host1',
'availability_zone': 'zone1',
'topic': "compute"})
result = self.cloud.describe_instances(self.context)
self.assertEqual(result['reservationSet'][0]\
['instancesSet'][0]\
['placement']['availabilityZone'], 'zone1')
db.instance_destroy(self.context, instance1['id'])
db.service_destroy(self.context, service1['id'])
def test_instance_update_state(self): def test_instance_update_state(self):
def instance(num): def instance(num):
return { return {