Improved testing of logged errors

Author: jim-easterbrook

tests/test_error.py

@@ -37,7 +37,7 @@ def test_LogMsg(self):
         self.check_result(
             exiv2.LogMsg.level(), exiv2.LogMsg.Level, exiv2.LogMsg.Level.debug)
         # get exiv2 to log a message
-        with self.assertLogs(level=logging.WARNING):
+        with self.assertLogs('exiv2', logging.WARNING):
             comment = exiv2.CommentValue('charset=invalid Fred')
         # test setting and clearing handler
         self.assertEqual(exiv2.LogMsg.handler(), exiv2.pythonHandler)

tests/test_types.py

@@ -155,10 +155,10 @@ def test_localisation(self):
             # test localisation
             self.check_result(exiv2.exvGettext(str_en), str, str_de)
             if exiv2.testVersion(0, 28, 3) or not exiv2.testVersion(0, 28, 0):
-                with self.assertLogs(level=logging.WARNING) as cm:
+                with self.assertLogs('exiv2', logging.WARNING) as cm:
                     comment = exiv2.CommentValue('charset=invalid Fred')
-                self.assertEqual(cm.output, [
-                    'WARNING:exiv2:Ungültiger Zeichensatz: "invalid"'])
+                self.assertIn('WARNING:exiv2:Ungültiger Zeichensatz: "invalid"',
+                              cm.output)
                 with self.assertRaises(exiv2.Exiv2Error) as cm:
                     key = exiv2.ExifKey(999, 'Invalid')
                 self.assertEqual(cm.exception.message.replace('"', "'"),