fix logger_test.py

felixdivo · felixdivo · commit 74b59cf1ba82 · 2018-07-29T12:04:01.000+02:00
diff --git a/can/io/logger.py b/can/io/logger.py
@@ -41,18 +41,24 @@ class Logger(BaseIOHandler, Listener):
     @staticmethod
     def __new__(cls, filename, *args, **kwargs):
         """
-        :param str filename: the filename/path the file to write to
+        :type filename: str or None or path-like
+        :param filename: the filename/path the file to write to,
+                         may be a path-like object if the target logger supports
+                         it, and may be None to instantiate a :class:`~can.Printer`
+
         """
-        if filename.endswith(".asc"):
-            return ASCWriter(filename, *args, **kwargs)
-        elif filename.endswith(".blf"):
-            return BLFWriter(filename, *args, **kwargs)
-        elif filename.endswith(".csv"):
-            return CSVWriter(filename, *args, **kwargs)
-        elif filename.endswith(".db"):
-            return SqliteWriter(filename, *args, **kwargs)
-        elif filename.endswith(".log"):
-            return CanutilsLogWriter(filename, *args, **kwargs)
-        else:
-            log.info('unknown file type "%s", falling pack to can.Printer', filename)
-            return Printer(filename, *args, **kwargs)
+        if filename:
+            if filename.endswith(".asc"):
+                return ASCWriter(filename, *args, **kwargs)
+            elif filename.endswith(".blf"):
+                return BLFWriter(filename, *args, **kwargs)
+            elif filename.endswith(".csv"):
+                return CSVWriter(filename, *args, **kwargs)
+            elif filename.endswith(".db"):
+                return SqliteWriter(filename, *args, **kwargs)
+            elif filename.endswith(".log"):
+                return CanutilsLogWriter(filename, *args, **kwargs)
+
+        # else:
+        log.info('unknown file type "%s", falling pack to can.Printer', filename)
+        return Printer(filename, *args, **kwargs)
diff --git a/test/listener_test.py b/test/listener_test.py
@@ -12,6 +12,7 @@
 import logging
 import tempfile
 import sqlite3
+from os.path import join, dirname
 
 import can
 
@@ -91,7 +92,14 @@ def testRemoveListenerFromNotifier(self):
 
     def testPlayerTypeResolution(self):
         def test_filetype_to_instance(extension, klass):
-            with tempfile.NamedTemporaryFile(suffix=extension) as my_file:
+            print("testing: {}".format(extension))
+
+            if extension == ".blf":
+                file_handler = open(join(dirname(__file__), "data/logfile.blf"))
+            else:
+                file_handler = tempfile.NamedTemporaryFile(suffix=extension)
+
+            with file_handler as my_file:
                 with can.LogReader(my_file.name) as reader:
                     self.assertIsInstance(reader, klass)
 
@@ -104,11 +112,10 @@ def test_filetype_to_instance(extension, klass):
         # test file extensions that are not supported
         with self.assertRaisesRegexp(NotImplementedError, ".xyz_42"):
             test_filetype_to_instance(".xyz_42", can.Printer)
-        with self.assertRaises(Exception):
-            test_filetype_to_instance(None, can.Printer)
 
     def testLoggerTypeResolution(self):
         def test_filetype_to_instance(extension, klass):
+            print("testing: {}".format(extension))
             with tempfile.NamedTemporaryFile(suffix=extension) as my_file:
                 with can.Logger(my_file.name) as writer:
                     self.assertIsInstance(writer, klass)
@@ -121,8 +128,11 @@ def test_filetype_to_instance(extension, klass):
         test_filetype_to_instance(".txt", can.Printer)
 
         # test file extensions that should use a fallback
+        test_filetype_to_instance("", can.Printer)
+        test_filetype_to_instance(".", can.Printer)
         test_filetype_to_instance(".some_unknown_extention_42", can.Printer)
-        test_filetype_to_instance(None, can.Printer)
+        with can.Logger(None) as logger:
+            self.assertIsInstance(logger, can.Printer)
 
     def testBufferedListenerReceives(self):
         a_listener = can.BufferedReader()
