testing refactor

This commit is contained in:
Ken Pepple
2011-02-10 11:21:53 -08:00
parent 53a9387e0a
commit 4856e6526a
2 changed files with 5 additions and 7 deletions

View File

@@ -623,7 +623,7 @@ class InstanceTypeCommands(object):
arguments: name memory_mb vcpus local_gb""" arguments: name memory_mb vcpus local_gb"""
try: try:
instance_types.create(name, memory, vcpus, local_gb, flavorid) instance_types.create(name, memory, vcpus, local_gb, flavorid)
except exception.InvalidInputException, e: except exception.InvalidInputException:
print "Must supply valid parameters to create instance type" print "Must supply valid parameters to create instance type"
sys.exit(1) sys.exit(1)
except exception.DBError, e: except exception.DBError, e:

View File

@@ -14,7 +14,7 @@
""" """
Unit Tests for instance types code Unit Tests for instance types code
""" """
import datetime import time
from nova import context from nova import context
from nova import db from nova import db
@@ -37,12 +37,10 @@ class InstanceTypeTestCase(test.TestCase):
super(InstanceTypeTestCase, self).setUp() super(InstanceTypeTestCase, self).setUp()
session = get_session() session = get_session()
max_flavorid = session.query(models.InstanceTypes).\ max_flavorid = session.query(models.InstanceTypes).\
order_by("flavorid desc").first() order_by("flavorid desc").\
first()
self.flavorid = max_flavorid["flavorid"] + 1 self.flavorid = max_flavorid["flavorid"] + 1
self.name = str(datetime.datetime.utcnow()) self.name = str(int(time.time()))
def tearDown(self):
pass
def test_instance_type_create_then_delete(self): def test_instance_type_create_then_delete(self):
"""Ensure instance types can be created""" """Ensure instance types can be created"""