34fd61bdc2
Update all .py source files by
$ pyupgrade --py3-only $(git ls-files | grep ".py$")
to modernize the code according to Python 3 syntaxes.
pep8 errors are fixed by
$ autopep8 --select=E127,E128,E501 --max-line-length 79 -r \
--in-place oslo_messaging
and a few manual adjustments.
Also add the pyupgrade hook to pre-commit to avoid merging additional
Python 2 syntaxes.
Change-Id: I8115b7f8c5d27ce935e4422c351add4bb72e354f
66 lines
2.1 KiB
Python
66 lines
2.1 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
# Copyright 2013 Red Hat, 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.
|
|
|
|
import oslo_messaging
|
|
from oslo_messaging.tests import utils as test_utils
|
|
|
|
|
|
class TestExpectedExceptions(test_utils.BaseTestCase):
|
|
|
|
def test_exception(self):
|
|
e = None
|
|
try:
|
|
try:
|
|
raise ValueError()
|
|
except Exception:
|
|
raise oslo_messaging.ExpectedException()
|
|
except oslo_messaging.ExpectedException as e: # noqa: F841
|
|
self.assertIsInstance(e, oslo_messaging.ExpectedException)
|
|
self.assertTrue(hasattr(e, 'exc_info'))
|
|
self.assertIsInstance(e.exc_info[1], ValueError)
|
|
|
|
def test_decorator_expected(self):
|
|
class FooException(Exception):
|
|
pass
|
|
|
|
@oslo_messaging.expected_exceptions(FooException)
|
|
def naughty():
|
|
raise FooException()
|
|
|
|
self.assertRaises(oslo_messaging.ExpectedException, naughty)
|
|
|
|
def test_decorator_expected_subclass(self):
|
|
class FooException(Exception):
|
|
pass
|
|
|
|
class BarException(FooException):
|
|
pass
|
|
|
|
@oslo_messaging.expected_exceptions(FooException)
|
|
def naughty():
|
|
raise BarException()
|
|
|
|
self.assertRaises(oslo_messaging.ExpectedException, naughty)
|
|
|
|
def test_decorator_unexpected(self):
|
|
class FooException(Exception):
|
|
pass
|
|
|
|
@oslo_messaging.expected_exceptions(FooException)
|
|
def really_naughty():
|
|
raise ValueError()
|
|
|
|
self.assertRaises(ValueError, really_naughty)
|