Fix unit tests

The unit tests were failing with
"ImportError: No module named trove.api".

Changed the __init__.py file to point to trove_dashboard.api

Added back the trove exception to the test data.

Change-Id: Ifbd50a1ee90b08b5b0aebb1190b3b3f4043876fb
Closes-Bug: 1532238
This commit is contained in:
Duk Loi 2016-01-08 10:40:55 -05:00
parent bac61fbfd2
commit 199743329d
3 changed files with 35 additions and 1 deletions

View File

@ -1,4 +1,4 @@
from openstack_dashboard.contrib.trove.api import trove
from trove_dashboard.api import trove
__all__ = [
"trove"

View File

@ -0,0 +1,31 @@
# Copyright 2016 Tesora Inc.
#
# 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
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from openstack_dashboard.test.test_data import exceptions
from openstack_dashboard.test.test_data import utils
from troveclient import exceptions as trove_exceptions
def data(TEST):
if not TEST.exceptions:
TEST.exceptions = utils.TestDataContainer()
trove_exception = trove_exceptions.ClientException
TEST.exceptions.trove = (exceptions.
create_stubbed_exception(trove_exception))
trove_auth = trove_exceptions.Unauthorized
TEST.exceptions.trove_unauthorized = (exceptions.
create_stubbed_exception(trove_auth))

View File

@ -25,6 +25,8 @@ def load_test_data(load_onto=None):
from openstack_dashboard.test.test_data import nova_data
from openstack_dashboard.test.test_data import swift_data
from trove_dashboard.test.test_data import exceptions \
as trove_exceptions
from trove_dashboard.test.test_data import keystone_data \
as trove_keystone_data
from trove_dashboard.test.test_data import trove_data
@ -32,6 +34,7 @@ def load_test_data(load_onto=None):
# The order of these loaders matters, some depend on others.
loaders = (
exceptions.data,
trove_exceptions.data,
keystone_data.data,
glance_data.data,
nova_data.data,