openstack
/
masakari
Code Issues Proposed changes

Remove support for py34 

The gating on python 3.4 is restricted to <= Mitaka. This is due to
the change from Ubuntu Trusty to Xenial, where only python3.5 is
available. There is no need to continue to keep these settings.

Change-Id: Ieecf7342152cc813ec3585a3b1873ac0dc13d804
This commit is contained in:
Vu Cong Tuan 2017-06-05 11:37:11 +07:00
parent 1ad9c148cd
commit b26ba43f72
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
masakari/tests/unit/test_exception.py
View File

@ -40,7 +40,7 @@ class MasakariExceptionTestCase(test.NoDBTestCase):
class FakeMasakariException(exception.MasakariException):
msg_fmt = "default message: %(code)s"
exc = FakeMasakariException(code=http.INTERNAL_SERVER_ERROR)
exc = FakeMasakariException(code=int(http.INTERNAL_SERVER_ERROR))
self.assertEqual('default message: 500', six.text_type(exc))
self.assertEqual('default message: 500', exc.message)
@ -48,7 +48,7 @@ class MasakariExceptionTestCase(test.NoDBTestCase):
class FakeMasakariException(exception.MasakariException):
msg_fmt = "default message: %(misspelled_code)s"
exc = FakeMasakariException(code=http.INTERNAL_SERVER_ERROR,
exc = FakeMasakariException(code=int(http.INTERNAL_SERVER_ERROR),
misspelled_code='blah')
self.assertEqual('default message: blah', six.text_type(exc))
self.assertEqual('default message: blah', exc.message)
@ -103,14 +103,14 @@ class MasakariExceptionTestCase(test.NoDBTestCase):
class ConvertedExceptionTestCase(test.NoDBTestCase):
def test_instantiate(self):
exc = exception.ConvertedException(http.BAD_REQUEST,
exc = exception.ConvertedException(int(http.BAD_REQUEST),
'Bad Request', 'reason')
self.assertEqual(exc.code, http.BAD_REQUEST)
self.assertEqual(exc.title, 'Bad Request')
self.assertEqual(exc.explanation, 'reason')
def test_instantiate_without_title_known_code(self):
exc = exception.ConvertedException(http.INTERNAL_SERVER_ERROR)
exc = exception.ConvertedException(int(http.INTERNAL_SERVER_ERROR))
self.assertEqual(exc.title, status_reasons[http.INTERNAL_SERVER_ERROR])
def test_instantiate_without_title_unknown_code(self):
@ -124,7 +124,7 @@ class ConvertedExceptionTestCase(test.NoDBTestCase):
class ExceptionTestCase(test.NoDBTestCase):
@staticmethod
def _raise_exc(exc):
raise exc(http.INTERNAL_SERVER_ERROR)
raise exc(int(http.INTERNAL_SERVER_ERROR))
def test_exceptions_raise(self):
# NOTE(Dinesh_Bhor): disable format errors since we are not passing

2
setup.cfg
View File

@ -16,7 +16,7 @@ classifier =
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
[files]
packages =

4
tox.ini
View File

@ -1,6 +1,6 @@
[tox]
minversion = 2.0
envlist = py34,py27,pep8
envlist = py35,py27,pep8
skipsdist = True
[testenv]
@ -29,7 +29,7 @@ commands =
{[testenv]commands}
ostestr '{posargs}'
[testenv:py34]
[testenv:py35]
commands =
{[testenv]commands}
ostestr '{posargs}'