Refactor unsupported default store testing

This change improves coverage while saving ~10 seconds per test run.

Part of bp:faster-better-stronger-functional-tests

Change-Id: Id4d68ccb223205f27bed0c1e9d3072b51310b979
This commit is contained in:
Mark J. Washenberger 2013-06-17 17:01:49 -07:00
parent 9daf38706f
commit 2538660d79
2 changed files with 64 additions and 15 deletions

View File

@ -273,18 +273,3 @@ class TestApi(functional.FunctionalTest):
self.assertEqual(response.status, 200)
self.stop_servers()
@skip_if_disabled
def test_unsupported_default_store(self):
"""
We test that a mis-configured default_store causes the API server
to fail to start.
"""
self.cleanup()
self.default_store = 'shouldnotexist'
# ensure that the API server fails to launch
self.start_server(self.api_server,
expect_launch=False,
expected_exitcode=1,
**self.__dict__.copy())

View File

@ -0,0 +1,64 @@
# 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 StringIO
import sys
import glance.cmd.api
import glance.common.config
from glance.common import exception as exc
import glance.common.wsgi
from glance.tests import utils as test_utils
class TestGlanceApiCmd(test_utils.BaseTestCase):
def _do_nothing(self, *args, **kwargs):
pass
def _raise(self, exc):
def fake(*args, **kwargs):
raise exc
return fake
def setUp(self):
super(TestGlanceApiCmd, self).setUp()
sys.argv = ['glance-api']
self.stderr = StringIO.StringIO()
sys.stderr = self.stderr
self.stubs.Set(glance.common.config, 'load_paste_app',
self._do_nothing)
self.stubs.Set(glance.common.wsgi.Server, 'start',
self._do_nothing)
self.stubs.Set(glance.common.wsgi.Server, 'wait',
self._do_nothing)
def tearDown(self):
sys.stderr = sys.__stderr__
super(TestGlanceApiCmd, self).tearDown()
def test_supported_default_store(self):
self.config(default_store='file')
glance.cmd.api.main()
def test_unsupported_default_store(self):
self.config(default_store='shouldnotexist')
exit = self.assertRaises(SystemExit, glance.cmd.api.main)
self.assertEquals(exit.code, 1)
def test_worker_creation_failure(self):
failure = exc.WorkerCreationFailure(reason='test')
self.stubs.Set(glance.common.wsgi.Server, 'start',
self._raise(failure))
exit = self.assertRaises(SystemExit, glance.cmd.api.main)
self.assertEquals(exit.code, 2)