From 881247a823d8223665e2cf7bef5bb3b245a2443d Mon Sep 17 00:00:00 2001 From: Matthias Date: Thu, 21 Dec 2023 19:26:52 +0100 Subject: [PATCH] use isinstance for type checks --- tests/data/test_datahandler.py | 6 +++--- tests/test_log_setup.py | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/data/test_datahandler.py b/tests/data/test_datahandler.py index 988e7ea55..d90822bd3 100644 --- a/tests/data/test_datahandler.py +++ b/tests/data/test_datahandler.py @@ -513,11 +513,11 @@ def test_gethandlerclass(): def test_get_datahandler(testdatadir): dh = get_datahandler(testdatadir, 'json') - assert type(dh) == JsonDataHandler + assert isinstance(dh, JsonDataHandler) dh = get_datahandler(testdatadir, 'jsongz') - assert type(dh) == JsonGzDataHandler + assert isinstance(dh, JsonGzDataHandler) dh1 = get_datahandler(testdatadir, 'jsongz', dh) assert id(dh1) == id(dh) dh = get_datahandler(testdatadir, 'hdf5') - assert type(dh) == HDF5DataHandler + assert isinstance(dh, HDF5DataHandler) diff --git a/tests/test_log_setup.py b/tests/test_log_setup.py index 182e78730..4310b8f09 100644 --- a/tests/test_log_setup.py +++ b/tests/test_log_setup.py @@ -63,9 +63,9 @@ def test_set_loggers_syslog(): setup_logging_pre() setup_logging(config) assert len(logger.handlers) == 3 - assert [x for x in logger.handlers if type(x) == logging.handlers.SysLogHandler] - assert [x for x in logger.handlers if type(x) == FTStdErrStreamHandler] - assert [x for x in logger.handlers if type(x) == FTBufferingHandler] + assert [x for x in logger.handlers if isinstance(x, logging.handlers.SysLogHandler)] + assert [x for x in logger.handlers if isinstance(x, FTStdErrStreamHandler)] + assert [x for x in logger.handlers if isinstance(x, FTBufferingHandler)] # setting up logging again should NOT cause the loggers to be added a second time. setup_logging(config) assert len(logger.handlers) == 3 @@ -86,9 +86,9 @@ def test_set_loggers_Filehandler(tmp_path): setup_logging_pre() setup_logging(config) assert len(logger.handlers) == 3 - assert [x for x in logger.handlers if type(x) == logging.handlers.RotatingFileHandler] - assert [x for x in logger.handlers if type(x) == FTStdErrStreamHandler] - assert [x for x in logger.handlers if type(x) == FTBufferingHandler] + assert [x for x in logger.handlers if isinstance(x, logging.handlers.RotatingFileHandler)] + assert [x for x in logger.handlers if isinstance(x, FTStdErrStreamHandler)] + assert [x for x in logger.handlers if isinstance(x, FTBufferingHandler)] # setting up logging again should NOT cause the loggers to be added a second time. setup_logging(config) assert len(logger.handlers) == 3 @@ -112,7 +112,7 @@ def test_set_loggers_journald(mocker): setup_logging(config) assert len(logger.handlers) == 3 assert [x for x in logger.handlers if type(x).__name__ == "JournaldLogHandler"] - assert [x for x in logger.handlers if type(x) == FTStdErrStreamHandler] + assert [x for x in logger.handlers if isinstance(x, FTStdErrStreamHandler)] # reset handlers to not break pytest logger.handlers = orig_handlers