cf7cd655a2
If an error occurs in nova.cmd.baseproxy the method exit_with_error will be executed that looks as follows: def exit_with_error(msg, errno=-1): print(msg) and sys.exit(errno) However, in python2.7 this method terminates the application without printing anything(unable to flush on time) and in Python3.4 it does strange things because print() returns None. This commit modifies exit_with_error method to output error message with stderr(which in unbuffered). Change-Id: I519b68f8c2bc62988de87bdd2847d5f3be7e532d Closes-Bug: #1506213
79 lines
3.5 KiB
Python
79 lines
3.5 KiB
Python
# Copyright 2015 IBM Corp.
|
|
#
|
|
# 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 mock
|
|
from oslo_log import log as logging
|
|
from oslo_reports import guru_meditation_report as gmr
|
|
|
|
from nova.cmd import baseproxy
|
|
from nova import config
|
|
from nova.console import websocketproxy
|
|
from nova import test
|
|
from nova import version
|
|
|
|
|
|
@mock.patch.object(config, 'parse_args', new=lambda *args, **kwargs: None)
|
|
class BaseProxyTestCase(test.NoDBTestCase):
|
|
|
|
@mock.patch('os.path.exists', return_value=False)
|
|
# NOTE(mriedem): sys.exit raises TestingException so we can actually exit
|
|
# the test normally.
|
|
@mock.patch('sys.exit', side_effect=test.TestingException)
|
|
def test_proxy_ssl_without_cert(self, mock_exit, mock_exists):
|
|
self.flags(ssl_only=True)
|
|
self.assertRaises(test.TestingException, baseproxy.proxy,
|
|
'0.0.0.0', '6080')
|
|
mock_exit.assert_called_once_with(-1)
|
|
|
|
@mock.patch('os.path.exists', return_value=False)
|
|
@mock.patch('sys.exit', side_effect=test.TestingException)
|
|
def test_proxy_web_dir_does_not_exist(self, mock_exit, mock_exists):
|
|
self.flags(web='/my/fake/webserver/')
|
|
self.assertRaises(test.TestingException, baseproxy.proxy,
|
|
'0.0.0.0', '6080')
|
|
mock_exit.assert_called_once_with(-1)
|
|
|
|
@mock.patch('os.path.exists', return_value=True)
|
|
@mock.patch.object(logging, 'setup')
|
|
@mock.patch.object(gmr.TextGuruMeditation, 'setup_autorun')
|
|
@mock.patch('nova.console.websocketproxy.NovaWebSocketProxy.__init__',
|
|
return_value=None)
|
|
@mock.patch('nova.console.websocketproxy.NovaWebSocketProxy.start_server')
|
|
def test_proxy(self, mock_start, mock_init, mock_gmr, mock_log,
|
|
mock_exists):
|
|
# Force verbose=False so something else testing nova.cmd.baseproxy
|
|
# doesn't impact the call to mocked NovaWebSocketProxy.__init__.
|
|
self.flags(verbose=False)
|
|
baseproxy.proxy('0.0.0.0', '6080')
|
|
mock_log.assert_called_once_with(baseproxy.CONF, 'nova')
|
|
mock_gmr.mock_assert_called_once_with(version)
|
|
mock_init.assert_called_once_with(
|
|
listen_host='0.0.0.0', listen_port='6080', source_is_ipv6=False,
|
|
verbose=False, cert='self.pem', key=None, ssl_only=False,
|
|
daemon=False, record=False, traffic=False,
|
|
web='/usr/share/spice-html5', file_only=True,
|
|
RequestHandlerClass=websocketproxy.NovaProxyRequestHandler)
|
|
mock_start.assert_called_once_with()
|
|
|
|
@mock.patch('sys.stderr.write')
|
|
@mock.patch('os.path.exists', return_value=False)
|
|
@mock.patch('sys.exit', side_effect=test.TestingException)
|
|
def test_proxy_exit_with_error(self, mock_exit, mock_exists, mock_stderr):
|
|
self.flags(ssl_only=True)
|
|
self.assertRaises(test.TestingException, baseproxy.proxy,
|
|
'0.0.0.0', '6080')
|
|
mock_stderr.assert_called_once_with(
|
|
'SSL only and self.pem not found\n')
|
|
mock_exit.assert_called_once_with(-1)
|