cases: Stop ignoring the 'msg' parameter in assert* methods

This commit is contained in:
2021-06-27 00:23:07 +02:00
parent 60e6c013b2
commit eef07da56a

View File

@ -185,10 +185,8 @@ class _IrcTestCase(unittest.TestCase, Generic[TController]):
extra_format: Tuple = (), extra_format: Tuple = (),
) -> None: ) -> None:
if fail_msg: if fail_msg:
fail_msg = fail_msg.format( msg = fail_msg.format(*extra_format, item=member, list=container, msg=msg)
*extra_format, item=member, list=container, msg=msg super().assertIn(member, container, msg)
)
super().assertIn(member, container, fail_msg)
def assertNotIn( def assertNotIn(
self, self,
@ -199,10 +197,8 @@ class _IrcTestCase(unittest.TestCase, Generic[TController]):
extra_format: Tuple = (), extra_format: Tuple = (),
) -> None: ) -> None:
if fail_msg: if fail_msg:
fail_msg = fail_msg.format( msg = fail_msg.format(*extra_format, item=member, list=container, msg=msg)
*extra_format, item=member, list=container, msg=msg super().assertNotIn(member, container, msg)
)
super().assertNotIn(member, container, fail_msg)
def assertEqual( def assertEqual(
self, self,
@ -213,8 +209,8 @@ class _IrcTestCase(unittest.TestCase, Generic[TController]):
extra_format: Tuple = (), extra_format: Tuple = (),
) -> None: ) -> None:
if fail_msg: if fail_msg:
fail_msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg) msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg)
super().assertEqual(got, expects, fail_msg) super().assertEqual(got, expects, msg)
def assertNotEqual( def assertNotEqual(
self, self,
@ -225,8 +221,8 @@ class _IrcTestCase(unittest.TestCase, Generic[TController]):
extra_format: Tuple = (), extra_format: Tuple = (),
) -> None: ) -> None:
if fail_msg: if fail_msg:
fail_msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg) msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg)
super().assertNotEqual(got, expects, fail_msg) super().assertNotEqual(got, expects, msg)
def assertGreater( def assertGreater(
self, self,
@ -237,8 +233,8 @@ class _IrcTestCase(unittest.TestCase, Generic[TController]):
extra_format: Tuple = (), extra_format: Tuple = (),
) -> None: ) -> None:
if fail_msg: if fail_msg:
fail_msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg) msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg)
super().assertGreater(got, expects, fail_msg) super().assertGreater(got, expects, msg)
def assertGreaterEqual( def assertGreaterEqual(
self, self,
@ -249,8 +245,8 @@ class _IrcTestCase(unittest.TestCase, Generic[TController]):
extra_format: Tuple = (), extra_format: Tuple = (),
) -> None: ) -> None:
if fail_msg: if fail_msg:
fail_msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg) msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg)
super().assertGreaterEqual(got, expects, fail_msg) super().assertGreaterEqual(got, expects, msg)
def assertLess( def assertLess(
self, self,
@ -261,8 +257,8 @@ class _IrcTestCase(unittest.TestCase, Generic[TController]):
extra_format: Tuple = (), extra_format: Tuple = (),
) -> None: ) -> None:
if fail_msg: if fail_msg:
fail_msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg) msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg)
super().assertLess(got, expects, fail_msg) super().assertLess(got, expects, msg)
def assertLessEqual( def assertLessEqual(
self, self,
@ -273,8 +269,8 @@ class _IrcTestCase(unittest.TestCase, Generic[TController]):
extra_format: Tuple = (), extra_format: Tuple = (),
) -> None: ) -> None:
if fail_msg: if fail_msg:
fail_msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg) msg = fail_msg.format(*extra_format, got=got, expects=expects, msg=msg)
super().assertLessEqual(got, expects, fail_msg) super().assertLessEqual(got, expects, msg)
class BaseClientTestCase(_IrcTestCase[basecontrollers.BaseClientController]): class BaseClientTestCase(_IrcTestCase[basecontrollers.BaseClientController]):