Merge "Remove duplicate option certfile from Armada config"

This commit is contained in:
Zuul 2018-06-14 01:20:07 +00:00 committed by Gerrit Code Review
commit 902caee084
2 changed files with 27 additions and 1 deletions

View File

@ -95,7 +95,6 @@ path to the private key that includes the name of the key itself.""")),
def register_opts(conf):
conf.register_opts(default_options)
ks_loading.register_auth_conf_options(conf, group='keystone_authtoken')
ks_loading.register_session_conf_options(conf, group='keystone_authtoken')
def list_opts():

View File

@ -0,0 +1,27 @@
# Copyright 2018 AT&T Intellectual Property. All other 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 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.
import importlib
import falcon
from armada.tests.unit.api import base as test_base
class TestApi(test_base.BaseControllerTest):
def test_init_application(self):
server = importlib.import_module('armada.api.server')
api = server.create()
self.assertIsInstance(api, falcon.API)