x/tuskar-ui
Code Issues Proposed changes

Fixed tests

Browse Source 
These failures were caused by the new plugin
architecture.

Change-Id: I6bc20100f9a46b9a68e2fb88799231a3e46b4eb6
This commit is contained in:
Tzu-Mainn Chen
2013-08-13 14:51:00 -04:00
parent 88a453736b
commit 1cbcf7b35b
15 changed files with 48 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tuskar_ui/forms.py
View File

@@ -3,4 +3,3 @@ from django.forms import widgets
class NumberInput(widgets.TextInput): class NumberInput(widgets.TextInput):
input_type = 'number' input_type = 'number'

2
tuskar_ui/infrastructure/resource_management/flavors/tests.py
View File

@@ -3,7 +3,7 @@ from django import http
from mox import IsA from mox import IsA
from tuskar_ui import api as tuskar from tuskar_ui import api as tuskar
from openstack_dashboard.test import helpers as test from tuskar_ui.test import helpers as test
class FlavorTemplatesTests(test.BaseAdminViewTests): class FlavorTemplatesTests(test.BaseAdminViewTests):

15
tuskar_ui/infrastructure/resource_management/flavors/urls.py
View File

@@ -16,11 +16,16 @@
from django.conf.urls.defaults import patterns from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url from django.conf.urls.defaults import url
from tuskar_ui.infrastructure.resource_management.flavors.views import ActiveInstancesDataView from tuskar_ui.infrastructure.resource_management.flavors.views \
from tuskar_ui.infrastructure.resource_management.flavors.views import CreateView import ActiveInstancesDataView
from tuskar_ui.infrastructure.resource_management.flavors.views import DetailEditView from tuskar_ui.infrastructure.resource_management.flavors.views \
from tuskar_ui.infrastructure.resource_management.flavors.views import DetailView import CreateView
from tuskar_ui.infrastructure.resource_management.flavors.views import EditView from tuskar_ui.infrastructure.resource_management.flavors.views \
import DetailEditView
from tuskar_ui.infrastructure.resource_management.flavors.views \
import DetailView
from tuskar_ui.infrastructure.resource_management.flavors.views \
import EditView
FLAVORS = r'^(?P<flavor_id>[^/]+)/%s$' FLAVORS = r'^(?P<flavor_id>[^/]+)/%s$'

2
tuskar_ui/infrastructure/resource_management/nodes/tests.py
View File

@@ -4,7 +4,7 @@ from django import http
from mox import IsA from mox import IsA
from tuskar_ui import api as tuskar from tuskar_ui import api as tuskar
from openstack_dashboard.test import helpers as test from tuskar_ui.test import helpers as test
class ResourceViewTests(test.BaseAdminViewTests): class ResourceViewTests(test.BaseAdminViewTests):

3
tuskar_ui/infrastructure/resource_management/nodes/urls.py
View File

@@ -16,7 +16,8 @@ from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import url from django.conf.urls.defaults import url
from tuskar_ui.infrastructure.resource_management.nodes.views import DetailView from tuskar_ui.infrastructure.resource_management.nodes.views import DetailView
from tuskar_ui.infrastructure.resource_management.nodes.views import UnrackedView from tuskar_ui.infrastructure.resource_management.nodes.views \
import UnrackedView
NODES = r'^(?P<node_id>[^/]+)/%s$' NODES = r'^(?P<node_id>[^/]+)/%s$'

6
tuskar_ui/infrastructure/resource_management/nodes/views.py
View File

@@ -20,8 +20,10 @@ from horizon import tables
from horizon import tabs from horizon import tabs
from tuskar_ui import api as tuskar from tuskar_ui import api as tuskar
from tuskar_ui.infrastructure.resource_management.nodes.tables import UnrackedNodesTable from tuskar_ui.infrastructure.resource_management.nodes.tables \
from tuskar_ui.infrastructure.resource_management.nodes.tabs import NodeDetailTabs import UnrackedNodesTable
from tuskar_ui.infrastructure.resource_management.nodes.tabs \
import NodeDetailTabs
class UnrackedView(tables.DataTableView): class UnrackedView(tables.DataTableView):

3
tuskar_ui/infrastructure/resource_management/racks/tests.py
View File

@@ -15,9 +15,8 @@ from django import http
from mox import IsA from mox import IsA
from novaclient.v1_1.contrib import baremetal
from tuskar_ui import api as tuskar from tuskar_ui import api as tuskar
from openstack_dashboard.test import helpers as test from tuskar_ui.test import helpers as test
import base64 import base64
import tempfile import tempfile

3
tuskar_ui/infrastructure/resource_management/resource_classes/tables.py
View File

@@ -21,7 +21,6 @@ from horizon import exceptions
from horizon import tables from horizon import tables
from tuskar_ui import api as tuskar from tuskar_ui import api as tuskar
import tuskar_ui.tables
from tuskar_ui.forms import NumberInput from tuskar_ui.forms import NumberInput
from tuskar_ui.infrastructure. \ from tuskar_ui.infrastructure. \
resource_management.flavors import tables as flavors_tables resource_management.flavors import tables as flavors_tables
@@ -29,7 +28,7 @@ from tuskar_ui.infrastructure. \
resource_management.racks import tables as racks_tables resource_management.racks import tables as racks_tables
from tuskar_ui.infrastructure. \ from tuskar_ui.infrastructure. \
resource_management import resource_classes resource_management import resource_classes
import tuskar_ui.tables
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

10
tuskar_ui/infrastructure/resource_management/resource_classes/tests.py
View File

@@ -16,7 +16,7 @@ from django.core.urlresolvers import reverse
from django import http from django import http
from mox import IsA from mox import IsA
from tuskar_ui import api as tuskar from tuskar_ui import api as tuskar
from openstack_dashboard.test import helpers as test from tuskar_ui.test import helpers as test
class ResourceClassViewTests(test.BaseAdminViewTests): class ResourceClassViewTests(test.BaseAdminViewTests):
@@ -55,7 +55,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests):
add_racks_ids = [] add_racks_ids = []
api.tuskar.ResourceClass.list( tuskar.ResourceClass.list(
IsA(http.request.HttpRequest)).AndReturn( IsA(http.request.HttpRequest)).AndReturn(
self.tuskar_resource_classes.list()) self.tuskar_resource_classes.list())
tuskar.ResourceClass.\ tuskar.ResourceClass.\
@@ -79,7 +79,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests):
("%s?tab=resource_management_tabs__resource_classes_tab" % ("%s?tab=resource_management_tabs__resource_classes_tab" %
reverse("horizon:infrastructure:resource_management:index"))) reverse("horizon:infrastructure:resource_management:index")))
@test.create_stubs({api.tuskar.ResourceClass: ('get', 'list_flavors', @test.create_stubs({tuskar.ResourceClass: ('get', 'list_flavors',
'racks_ids', 'all_racks', 'racks_ids', 'all_racks',
'all_flavors')}) 'all_flavors')})
def test_edit_resource_class_get(self): def test_edit_resource_class_get(self):
@@ -194,7 +194,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests):
self.assertTemplateUsed(res, self.assertTemplateUsed(res,
'infrastructure/resource_management/resource_classes/detail.html') 'infrastructure/resource_management/resource_classes/detail.html')
@test.create_stubs({api.tuskar.ResourceClass: ('get', 'list_flavors', @test.create_stubs({tuskar.ResourceClass: ('get', 'list_flavors',
'racks_ids', 'all_racks', 'racks_ids', 'all_racks',
'all_flavors')}) 'all_flavors')})
def test_detail_edit_racks_get(self): def test_detail_edit_racks_get(self):
@@ -263,7 +263,7 @@ class ResourceClassViewTests(test.BaseAdminViewTests):
reverse(detail_url, args=(resource_class.id,))) reverse(detail_url, args=(resource_class.id,)))
self.assertRedirectsNoFollow(res, redirect_url) self.assertRedirectsNoFollow(res, redirect_url)
@test.create_stubs({api.tuskar.ResourceClass: ('get', 'list_flavors', @test.create_stubs({tuskar.ResourceClass: ('get', 'list_flavors',
'racks_ids', 'all_racks', 'racks_ids', 'all_racks',
'all_flavors')}) 'all_flavors')})
def test_detail_edit_flavors_get(self): def test_detail_edit_flavors_get(self):

2
tuskar_ui/infrastructure/resource_management/tests.py
View File

@@ -20,7 +20,7 @@ from django import http
from mox import IsA from mox import IsA
from tuskar_ui import api as tuskar from tuskar_ui import api as tuskar
from openstack_dashboard.test import helpers as test from tuskar_ui.test import helpers as test
class ResourceManagementTests(test.BaseAdminViewTests): class ResourceManagementTests(test.BaseAdminViewTests):

14
tuskar_ui/test/api_tests/tuskar_tests.py
View File

@@ -18,13 +18,13 @@ from __future__ import absolute_import
from novaclient.v1_1.contrib import baremetal from novaclient.v1_1.contrib import baremetal
from openstack_dashboard.api.tuskar import Capacity from tuskar_ui.api import Capacity
from openstack_dashboard.api.tuskar import Flavor from tuskar_ui.api import Flavor
from openstack_dashboard.api.tuskar import FlavorTemplate from tuskar_ui.api import FlavorTemplate
from openstack_dashboard.api.tuskar import Node from tuskar_ui.api import Node
from openstack_dashboard.api.tuskar import Rack from tuskar_ui.api import Rack
from openstack_dashboard.api.tuskar import ResourceClass from tuskar_ui.api import ResourceClass
from openstack_dashboard.test import helpers as test from tuskar_ui.test import helpers as test
class TuskarApiTests(test.APITestCase): class TuskarApiTests(test.APITestCase):

15
tuskar_ui/test/helpers.py
View File

@@ -51,7 +51,8 @@ from horizon.test import helpers as horizon_helpers
from openstack_dashboard import api from openstack_dashboard import api
from openstack_dashboard import context_processors from openstack_dashboard import context_processors
from openstack_dashboard.test.test_data.utils import load_test_data from tuskar_ui import api as tuskar_api
from tuskar_ui.test.test_data.utils import load_test_data
# Makes output of failing mox tests much easier to read. # Makes output of failing mox tests much easier to read.
@@ -263,8 +264,8 @@ class APITestCase(TestCase):
self._original_neutronclient = api.neutron.neutronclient self._original_neutronclient = api.neutron.neutronclient
self._original_cinderclient = api.cinder.cinderclient self._original_cinderclient = api.cinder.cinderclient
self._original_heatclient = api.heat.heatclient self._original_heatclient = api.heat.heatclient
self._original_tuskarclient = api.tuskar.tuskarclient self._original_tuskarclient = tuskar_api.tuskarclient
self._original_baremetalclient = api.tuskar.baremetalclient self._original_baremetalclient = tuskar_api.baremetalclient
# Replace the clients with our stubs. # Replace the clients with our stubs.
api.glance.glanceclient = lambda request: self.stub_glanceclient() api.glance.glanceclient = lambda request: self.stub_glanceclient()
@@ -273,8 +274,8 @@ class APITestCase(TestCase):
api.neutron.neutronclient = lambda request: self.stub_neutronclient() api.neutron.neutronclient = lambda request: self.stub_neutronclient()
api.cinder.cinderclient = lambda request: self.stub_cinderclient() api.cinder.cinderclient = lambda request: self.stub_cinderclient()
api.heat.heatclient = lambda request: self.stub_heatclient() api.heat.heatclient = lambda request: self.stub_heatclient()
api.tuskar.tuskarclient = lambda request: self.stub_tuskarclient() tuskar_api.tuskarclient = lambda request: self.stub_tuskarclient()
api.tuskar.baremetalclient = lambda request:\ tuskar_api.baremetalclient = lambda request:\
self.stub_baremetalclient() self.stub_baremetalclient()
def tearDown(self): def tearDown(self):
@@ -285,8 +286,8 @@ class APITestCase(TestCase):
api.neutron.neutronclient = self._original_neutronclient api.neutron.neutronclient = self._original_neutronclient
api.cinder.cinderclient = self._original_cinderclient api.cinder.cinderclient = self._original_cinderclient
api.heat.heatclient = self._original_heatclient api.heat.heatclient = self._original_heatclient
api.tuskar.tuskarclient = self._original_tuskarclient tuskar_api.tuskarclient = self._original_tuskarclient
api.tuskar.baremetalclient = self._original_baremetalclient tuskar_api.baremetalclient = self._original_baremetalclient
def stub_novaclient(self): def stub_novaclient(self):
if not hasattr(self, "novaclient"): if not hasattr(self, "novaclient"):

12
tuskar_ui/test/test_data/tuskar_data.py
View File

@@ -12,12 +12,12 @@
from collections import namedtuple from collections import namedtuple
from openstack_dashboard.api.tuskar import Capacity from tuskar_ui.api import Capacity
from openstack_dashboard.api.tuskar import Flavor from tuskar_ui.api import Flavor
from openstack_dashboard.api.tuskar import FlavorTemplate from tuskar_ui.api import FlavorTemplate
from openstack_dashboard.api.tuskar import Node from tuskar_ui.api import Node
from openstack_dashboard.api.tuskar import Rack from tuskar_ui.api import Rack
from openstack_dashboard.api.tuskar import ResourceClass from tuskar_ui.api import ResourceClass
from openstack_dashboard.test.test_data.utils import TestDataContainer from openstack_dashboard.test.test_data.utils import TestDataContainer

2
tuskar_ui/test/test_data/utils.py
View File

@@ -22,7 +22,7 @@ def load_test_data(load_onto=None):
from openstack_dashboard.test.test_data import neutron_data from openstack_dashboard.test.test_data import neutron_data
from openstack_dashboard.test.test_data import nova_data from openstack_dashboard.test.test_data import nova_data
from openstack_dashboard.test.test_data import swift_data from openstack_dashboard.test.test_data import swift_data
from openstack_dashboard.test.test_data import tuskar_data from tuskar_ui.test.test_data import tuskar_data
# The order of these loaders matters, some depend on others. # The order of these loaders matters, some depend on others.
loaders = (exceptions.data, loaders = (exceptions.data,

15
tuskar_ui/workflows.py
View File

@@ -14,28 +14,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import copy
import inspect
import logging import logging
from django.core import urlresolvers
from django import forms
from django.forms.forms import NON_FIELD_ERRORS
from django import template from django import template
from django.template.defaultfilters import linebreaks
from django.template.defaultfilters import safe
from django.template.defaultfilters import slugify
from django.utils.encoding import force_unicode
from django.utils.importlib import import_module
from django.utils.translation import ugettext_lazy as _
# FIXME: TableStep # FIXME: TableStep
from django.utils.datastructures import SortedDict from django.utils.datastructures import SortedDict
from horizon import base
from horizon import exceptions
from horizon.templatetags.horizon import has_permissions
from horizon.utils import html
import horizon.workflows import horizon.workflows