From c38219f30da4bfb59b5f344f9717b4595391b5b2 Mon Sep 17 00:00:00 2001 From: hardik Date: Tue, 26 Jul 2016 14:57:58 +0530 Subject: [PATCH] Fixed unit tests issue Change-Id: I97c4f21894cc30176f3dd6a333065a54139d8a0e --- mistraldashboard/actions/tests.py | 2 +- mistraldashboard/test/settings.py | 177 +----------------------------- 2 files changed, 6 insertions(+), 173 deletions(-) diff --git a/mistraldashboard/actions/tests.py b/mistraldashboard/actions/tests.py index a62a9a7..cf11a38 100644 --- a/mistraldashboard/actions/tests.py +++ b/mistraldashboard/actions/tests.py @@ -23,7 +23,7 @@ INDEX_URL = reverse('horizon:mistral:actions:index') class ActionsTest(test.TestCase): def test_index(self): - with mock.patch('mistraldashboard.api.action_list', + with mock.patch('mistraldashboard.api.pagination_list', return_value=self.mistralclient_actions.list()): res = self.client.get(INDEX_URL) diff --git a/mistraldashboard/test/settings.py b/mistraldashboard/test/settings.py index 7b6dd02..cd11fb7 100644 --- a/mistraldashboard/test/settings.py +++ b/mistraldashboard/test/settings.py @@ -1,3 +1,5 @@ +# Copyright 2015 Huawei Technologies Co., Ltd. +# Copyright 2016 NEC Corporation. All rights reserved # # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain @@ -11,177 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -import importlib -import os -import six - from horizon.test.settings import * # noqa -from horizon.utils import secret_key -from openstack_dashboard import exceptions +from openstack_dashboard.test.settings import * # noqa - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -TEST_DIR = os.path.dirname(os.path.abspath(__file__)) -ROOT_PATH = os.path.abspath(os.path.join(TEST_DIR, "..")) - -MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media')) -MEDIA_URL = '/media/' -STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static')) -STATIC_URL = '/static/' - -SECRET_KEY = secret_key.generate_or_read_from_file( - os.path.join(TEST_DIR, '.secret_key_store')) -ROOT_URLCONF = 'mistraldashboard.test.urls' -TEMPLATE_DIRS = ( - os.path.join(TEST_DIR, 'templates'), -) - -TEMPLATE_CONTEXT_PROCESSORS += ( - 'openstack_dashboard.context_processors.openstack', -) - -INSTALLED_APPS = ( - 'django.contrib.contenttypes', - 'django.contrib.auth', - 'django.contrib.sessions', - 'django.contrib.staticfiles', - 'django.contrib.messages', - 'django.contrib.humanize', - 'django_nose', - 'openstack_auth', - 'compressor', - 'horizon', - 'openstack_dashboard', - 'openstack_dashboard.dashboards', - 'mistraldashboard', -) - -AUTHENTICATION_BACKENDS = ('openstack_auth.backend.KeystoneBackend',) - -SITE_BRANDING = 'OpenStack' - -HORIZON_CONFIG = { - "password_validator": { - "regex": '^.{8,18}$', - "help_text": "Password must be between 8 and 18 characters." - }, - 'user_home': None, - 'help_url': "http://docs.openstack.org", - 'exceptions': {'recoverable': exceptions.RECOVERABLE, - 'not_found': exceptions.NOT_FOUND, - 'unauthorized': exceptions.UNAUTHORIZED}, - 'angular_modules': [], - 'js_files': [], -} - -# Load the pluggable dashboard settings -from openstack_dashboard.utils import settings -dashboard_module_names = [ - 'openstack_dashboard.enabled', - 'openstack_dashboard.local.enabled', -] -dashboard_modules = [] -# All dashboards must be enabled for the namespace to get registered, which is -# needed by the unit tests. -for module_name in dashboard_module_names: - module = importlib.import_module(module_name) - dashboard_modules.append(module) - for submodule in six.itervalues(settings.import_submodules(module)): - if getattr(submodule, 'DISABLED', None): - delattr(submodule, 'DISABLED') -INSTALLED_APPS = list(INSTALLED_APPS) # Make sure it's mutable -settings.update_dashboards(dashboard_modules, HORIZON_CONFIG, INSTALLED_APPS) - -# Set to True to allow users to upload images to glance via Horizon server. -# When enabled, a file form field will appear on the create image form. -# See documentation for deployment considerations. -HORIZON_IMAGES_ALLOW_UPLOAD = True - -AVAILABLE_REGIONS = [ - ('http://localhost:5000/v2.0', 'local'), - ('http://remote:5000/v2.0', 'remote'), -] - -OPENSTACK_API_VERSIONS = { - "identity": 3 -} - -OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v2.0" -OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_" - -OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True -OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'test_domain' - -OPENSTACK_KEYSTONE_BACKEND = { - 'name': 'native', - 'can_edit_user': True, - 'can_edit_group': True, - 'can_edit_project': True, - 'can_edit_domain': True, - 'can_edit_role': True -} - -OPENSTACK_CINDER_FEATURES = { - 'enable_backup': True, -} - -OPENSTACK_NEUTRON_NETWORK = { - 'enable_lb': False, - 'enable_firewall': False, - 'enable_vpn': False -} - -OPENSTACK_HYPERVISOR_FEATURES = { - 'can_set_mount_point': True, - - # NOTE: as of Grizzly this is not yet supported in Nova so enabling this - # setting will not do anything useful - 'can_encrypt_volumes': False -} - -LOGGING['loggers']['openstack_dashboard'] = { - 'handlers': ['test'], - 'propagate': False, -} - -LOGGING['loggers']['selenium'] = { - 'handlers': ['test'], - 'propagate': False, -} - -LOGGING['loggers']['mistraldashboard'] = { - 'handlers': ['test'], - 'propagate': False, -} - -SECURITY_GROUP_RULES = { - 'all_tcp': { - 'name': 'ALL TCP', - 'ip_protocol': 'tcp', - 'from_port': '1', - 'to_port': '65535', - }, - 'http': { - 'name': 'HTTP', - 'ip_protocol': 'tcp', - 'from_port': '80', - 'to_port': '80', - }, -} - -NOSE_ARGS = ['--nocapture', - '--nologcapture', - '--cover-package=openstack_dashboard', - '--cover-inclusive', - '--all-modules'] - -POLICY_FILES_PATH = os.path.join(ROOT_PATH, "conf") -POLICY_FILES = { - 'identity': 'keystone_policy.json', - 'compute': 'nova_policy.json' -} - -# The openstack_auth.user.Token object isn't JSON-serializable ATM -SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' +INSTALLED_APPS = list(INSTALLED_APPS) +INSTALLED_APPS.append('mistraldashboard')