Merge "Refactoring UT directories"

This commit is contained in:
Zuul 2018-11-14 15:53:01 +00:00 committed by Gerrit Code Review
commit 24f4459f26
32 changed files with 6 additions and 6 deletions

View File

@ -5,4 +5,4 @@ pipeline = extensions extensions_test_app
paste.filter_factory = tacker.common.extensions:plugin_aware_extension_middleware_factory
[app:extensions_test_app]
paste.app_factory = tacker.tests.unit.test_extensions:app_factory
paste.app_factory = tacker.tests.unit.api.test_extensions:app_factory

View File

View File

@ -22,8 +22,8 @@ import webtest
from tacker.api import extensions
from tacker.api.v1 import attributes
from tacker.tests.unit import test_api_v2
from tacker.tests.unit import test_extensions
from tacker.tests.unit.api import test_extensions
from tacker.tests.unit.api.v2 import test_api_v2
from tacker.tests.unit import testlib_api

View File

View File

View File

@ -33,7 +33,7 @@ class ConfigurationTest(base.BaseTestCase):
self.assertEqual('keystone', cfg.CONF.auth_strategy)
self.assertTrue(cfg.CONF.allow_bulk)
relative_dir = os.path.join(os.path.dirname(__file__),
'..', '..', '..')
'..', '..', '..', '..')
absolute_dir = os.path.abspath(relative_dir)
self.assertEqual(absolute_dir, cfg.CONF.state_path)
self.assertEqual('tacker', cfg.CONF.control_exchange)

View File

View File

@ -25,8 +25,8 @@ from tacker.api.v1 import attributes
from tacker.common import config
from tacker import manager
from tacker.tests import base
from tacker.tests.unit.api.v2 import test_api_v2
from tacker.tests.unit.extensions import extendedattribute as extattr
from tacker.tests.unit import test_api_v2
from tacker.tests.unit import testlib_api
from tacker import wsgi

View File

View File

View File

View File

View File

View File

View File

View File

@ -33,7 +33,7 @@ class TestSamples(testtools.TestCase):
def _get_list_of_sample(self, tosca_files):
if tosca_files:
base_path = (os.path.dirname(os.path.abspath(__file__)) +
'/../../../samples/tosca-templates/vnfd/')
'/../../../../samples/tosca-templates/vnfd/')
if isinstance(tosca_files, list):
list_of_samples = []
for tosca_file in tosca_files: