x/gantt
Code Issues Proposed changes

fix tests

Browse Source
This commit is contained in:
Vishvananda Ishaya
2010-10-12 19:27:48 -07:00
parent 70a0758924
commit 7e0ae14ee7
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/network_unittest.py
View File

@@ -58,7 +58,8 @@ class NetworkTestCase(test.TrialTestCase):
user_context = context.APIRequestContext(project=self.projects[i],
user=self.user)
network_ref = self.network.get_network(user_context)
self.network.set_network_host(user_context, network_ref['id'])
self.network.set_network_host(context.get_admin_context(),
network_ref['id'])
instance_ref = self._create_instance(0)
self.instance_id = instance_ref['id']
instance_ref = self._create_instance(1)

13
nova/tests/virt_unittest.py
View File

@@ -20,21 +20,22 @@ from xml.dom.minidom import parseString as xml_to_dom
from nova import db
from nova import flags
from nova import test
from nova import utils
from nova.api import context
from nova.api.ec2 import cloud
from nova.auth import manager
# Needed to get FLAGS.instances_path defined:
from nova.compute import manager as compute_manager
from nova.virt import libvirt_conn
FLAGS = flags.FLAGS
flags.DECLARE('instances_path', 'nova.compute.manager')
class LibvirtConnTestCase(test.TrialTestCase):
def setUp(self):
super(LibvirtConnTestCase, self).setUp()
self.manager = manager.AuthManager()
self.user = self.manager.create_user('fake', 'fake', 'fake', admin=True)
self.project = self.manager.create_project('fake', 'fake', 'fake')
self.network = utils.import_object(FLAGS.network_manager)
FLAGS.instances_path = ''
def test_get_uri_and_template(self):
@@ -51,7 +52,11 @@ class LibvirtConnTestCase(test.TrialTestCase):
'instance_type' : 'm1.small'}
instance_ref = db.instance_create(None, instance)
network_ref = db.project_get_network(None, self.project.id)
user_context = context.APIRequestContext(project=self.project,
user=self.user)
network_ref = self.network.get_network(user_context)
self.network.set_network_host(context.get_admin_context(),
network_ref['id'])
fixed_ip = { 'address' : ip,
'network_id' : network_ref['id'] }