general cleanup of the tests

felixdivo · felixdivo · commit 78e4834ea236 · 2018-02-22T17:47:55.000+01:00
diff --git a/test/back2back_test.py b/test/back2back_test.py
@@ -1,3 +1,13 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+This module tests two virtual busses attached to each other.
+
+Some tests are skipped when run on Travis CI because they are not
+reproducible, see #243 (https://github.com/hardbyte/python-can/issues/243).
+"""
+
 import os
 import unittest
 import time
diff --git a/test/data/__init__.py b/test/data/__init__.py
@@ -0,0 +1,2 @@
+#!/usr/bin/env python
+# coding: utf-8
diff --git a/test/data/example_data.py b/test/data/example_data.py
@@ -1,4 +1,5 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+# coding: utf-8
 
 """
 This module contains some example data, like messages of different
diff --git a/test/listener_test.py b/test/listener_test.py
@@ -1,3 +1,9 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+"""
+
 from time import sleep
 import unittest
 import random
diff --git a/test/logformats_test.py b/test/logformats_test.py
@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# coding: utf-8
+
 """
 This test module test the separate reader/writer combinations of the can.io.*
 modules by writing some messages to a temporary file and reading it again.
@@ -8,6 +11,8 @@
 comments.
 """
 
+from __future__ import print_function
+
 import unittest
 import tempfile
 from time import sleep
diff --git a/test/network_test.py b/test/network_test.py
@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# coding: utf-8
+
 from __future__ import print_function
 
 import unittest
diff --git a/test/serial_test.py b/test/serial_test.py
@@ -1,31 +1,17 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+# coding: utf-8
 
 """
-Name:        serial_test
-Purpose:     Testing the serial interface
+This module is testing the serial interface.
 
-Copyright:   2017 Boris Wenzlaff
-
-This file is part of python-can <https://github.com/hardbyte/python-can/>.
-
-python-can is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-any later version.
-
-python-can is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with python-can. If not, see <http://www.gnu.org/licenses/>.
+Copyright: 2017 Boris Wenzlaff
 """
 
 import unittest
+from mock import patch
+
 import can
 from can.interfaces.serial.serial_can import SerialBus
-from mock import patch
 
 
 class SerialDummy:
diff --git a/test/simplecyclic_test.py b/test/simplecyclic_test.py
@@ -1,3 +1,13 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+This module tests cyclic send tasks.
+
+Some tests are skipped when run on Travis CI because they are not
+reproducible, see #243 (https://github.com/hardbyte/python-can/issues/243).
+"""
+
 import os
 from time import sleep
 import unittest
diff --git a/test/test_kvaser.py b/test/test_kvaser.py
@@ -1,9 +1,14 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+"""
+
 import ctypes
 import unittest
 import time
 import logging
-logging.basicConfig(level=logging.DEBUG)
+
 import can
 from can.interfaces.kvaser import canlib
 from can.interfaces.kvaser import constants
diff --git a/test/zero_dlc_test.py b/test/zero_dlc_test.py
@@ -1,6 +1,13 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+"""
+"""
+
 from time import sleep
 import unittest
 import logging
+
 import can
 
 logging.getLogger(__file__).setLevel(logging.DEBUG)
@@ -11,7 +18,8 @@ class ZeroDLCTest(unittest.TestCase):
     def test_recv_non_zero_dlc(self):
         bus_send = can.interface.Bus(bustype='virtual')
         bus_recv = can.interface.Bus(bustype='virtual')
-        msg_send = can.Message(extended_id=False, arbitration_id=0x100, data=[0,1,2,3,4,5,6,7])
+        data = [0, 1, 2, 3, 4, 5, 6, 7]
+        msg_send = can.Message(extended_id=False, arbitration_id=0x100, data=data)
 
         bus_send.send(msg_send)
         msg_recv = bus_recv.recv()
@@ -27,7 +35,6 @@ def test_recv_none(self):
         # Receiving nothing should evaluate msg_recv to False
         self.assertFalse(msg_recv)
 
-
     def test_recv_zero_dlc(self):
         bus_send = can.interface.Bus(bustype='virtual')
         bus_recv = can.interface.Bus(bustype='virtual')
@@ -39,5 +46,6 @@ def test_recv_zero_dlc(self):
         # Receiving a frame without data (dlc == 0) should evaluate msg_recv to True
         self.assertTrue(msg_recv)
 
+
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/usr/bin/env python`
	`2`	`+# coding: utf-8`