x/tuskar-ui
Code Issues Proposed changes

Updated flavor test_data to use Flavor model

Browse Source 
Corrected flavor tests to use management_flavors

Change-Id: I7a0913cbccc9a1e02736f2bcdfb1b160484369a2
This commit is contained in:
Tzu-Mainn Chen
2013-06-13 13:54:37 -04:00
committed by Tomas Sedovic
parent 317f84e3d6
commit 23cd37917c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/dashboards/infrastructure/resource_management/flavors/tests.py
View File

@@ -10,7 +10,7 @@ class FlavorsTests(test.BaseAdminViewTests):
@test.create_stubs({api.management.Flavor: ('list', 'create'), })
def test_create_flavor(self):
flavor = self.flavors.first()
flavor = self.management_flavors.first()
api.management.Flavor.list(IsA(http.HttpRequest))
api.management.Flavor.create(IsA(http.HttpRequest),
@@ -31,7 +31,7 @@ class FlavorsTests(test.BaseAdminViewTests):
@test.create_stubs({api.management.Flavor: ('list', 'update', 'get'), })
def test_edit_flavor(self):
flavor = self.flavors.first() # has no extra spec
flavor = self.management_flavors.first() # has no extra spec
# GET
api.management.Flavor.get(IsA(http.HttpRequest),
@@ -66,10 +66,10 @@ class FlavorsTests(test.BaseAdminViewTests):
@test.create_stubs({api.management.Flavor: ('list', 'delete'), })
def test_delete_flavor(self):
flavor = self.flavors.first()
flavor = self.management_flavors.first()
api.management.Flavor.list(IsA(http.HttpRequest)).\
AndReturn(self.flavors.list())
AndReturn(self.management_flavors.list())
api.management.Flavor.delete(IsA(http.HttpRequest), flavor.id)
self.mox.ReplayAll()

10
openstack_dashboard/test/test_data/management_data.py
View File

@@ -21,10 +21,12 @@ def data(TEST):
TEST.management_flavors = TestDataContainer()
# Flavors
flavor_1 = Flavor({'id': "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
'name': 'm1.tiny'})
flavor_2 = Flavor({'id': "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
'name': 'm1.massive'})
flavor_1 = Flavor(dummymodels.Flavor(
id="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
name='m1.tiny'))
flavor_2 = Flavor(dummymodels.Flavor(
id="bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
name='m1.massive'))
TEST.management_flavors.add(flavor_1, flavor_2)
# Resource Classes