x/python-ganttclient
Code Issues Proposed changes

fix tests broken in the merge

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-07-28 01:31:09 +00:00
parent 38b04f47b0
commit c7d82c9fd4
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
nova/tests/test_db_api.py
View File

@@ -22,7 +22,6 @@ from nova import test
from nova import context from nova import context
from nova import db from nova import db
from nova import flags from nova import flags
from nova.auth import manager
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
@@ -45,42 +44,35 @@ def _setup_networking(instance_id, ip='1.2.3.4', flo_addr='1.2.1.2'):
db.fixed_ip_create(ctxt, fixed_ip) db.fixed_ip_create(ctxt, fixed_ip)
fix_ref = db.fixed_ip_get_by_address(ctxt, ip) fix_ref = db.fixed_ip_get_by_address(ctxt, ip)
db.floating_ip_create(ctxt, {'address': flo_addr, db.floating_ip_create(ctxt, {'address': flo_addr,
'fixed_ip_id': fix_ref.id}) 'fixed_ip_id': fix_ref['id']})
class DbApiTestCase(test.TestCase): class DbApiTestCase(test.TestCase):
def setUp(self): def setUp(self):
super(DbApiTestCase, self).setUp() super(DbApiTestCase, self).setUp()
self.manager = manager.AuthManager() self.user_id = 'fake'
self.user = self.manager.create_user('admin', 'admin', 'admin', True) self.project_id = 'fake'
self.project = self.manager.create_project('proj', 'admin', 'proj') self.context = context.RequestContext(self.user_id, self.project_id)
self.context = context.RequestContext(user=self.user,
project=self.project)
def tearDown(self):
self.manager.delete_project(self.project)
self.manager.delete_user(self.user)
super(DbApiTestCase, self).tearDown()
def test_instance_get_project_vpn(self): def test_instance_get_project_vpn(self):
result = db.fixed_ip_get_all(self.context)
values = {'instance_type_id': FLAGS.default_instance_type, values = {'instance_type_id': FLAGS.default_instance_type,
'image_ref': FLAGS.vpn_image_id, 'image_ref': FLAGS.vpn_image_id,
'project_id': self.project.id 'project_id': self.project_id
} }
instance = db.instance_create(self.context, values) instance = db.instance_create(self.context, values)
result = db.instance_get_project_vpn(self.context, self.project.id) result = db.instance_get_project_vpn(self.context.elevated(),
self.assertEqual(instance.id, result.id) self.project_id)
self.assertEqual(instance['id'], result['id'])
def test_instance_get_project_vpn_joins(self): def test_instance_get_project_vpn_joins(self):
result = db.fixed_ip_get_all(self.context)
values = {'instance_type_id': FLAGS.default_instance_type, values = {'instance_type_id': FLAGS.default_instance_type,
'image_ref': FLAGS.vpn_image_id, 'image_ref': FLAGS.vpn_image_id,
'project_id': self.project.id 'project_id': self.project_id
} }
instance = db.instance_create(self.context, values) instance = db.instance_create(self.context, values)
_setup_networking(instance.id) _setup_networking(instance['id'])
result = db.instance_get_project_vpn(self.context, self.project.id) result = db.instance_get_project_vpn(self.context.elevated(),
self.assertEqual(instance.id, result.id) self.project_id)
self.assertEqual(instance['id'], result['id'])
self.assertEqual(result['fixed_ips'][0]['floating_ips'][0].address, self.assertEqual(result['fixed_ips'][0]['floating_ips'][0].address,
'1.2.1.2') '1.2.1.2')

2
nova/tests/test_vmwareapi.py
View File

@@ -19,6 +19,7 @@
Test suite for VMWareAPI. Test suite for VMWareAPI.
""" """
from nova import context
from nova import db from nova import db
from nova import flags from nova import flags
from nova import test from nova import test
@@ -42,7 +43,6 @@ class VMWareAPIVMTestCase(test.TestCase):
self.flags(vmwareapi_host_ip='test_url', self.flags(vmwareapi_host_ip='test_url',
vmwareapi_host_username='test_username', vmwareapi_host_username='test_username',
vmwareapi_host_password='test_pass') vmwareapi_host_password='test_pass')
self.manager = manager.AuthManager()
self.user_id = 'fake' self.user_id = 'fake'
self.project_id = 'fake' self.project_id = 'fake'
self.context = context.RequestContext(self.user_id, self.project_id) self.context = context.RequestContext(self.user_id, self.project_id)