fix calling of tests

felixdivo · felixdivo · commit 132b8a2af6f2 · 2018-09-04T14:30:20.000+02:00
diff --git a/can/scripts/logger.py b/can/scripts/logger.py
@@ -68,8 +68,7 @@ def main():
     if len(sys.argv) < 2:
         parser.print_help(sys.stderr)
         import errno
-        sys.exit(errno.EINVAL)
-        return
+        raise SystemExit(errno.EINVAL)
 
     results = parser.parse_args()
 
diff --git a/can/scripts/player.py b/can/scripts/player.py
@@ -10,6 +10,7 @@
 
 from __future__ import absolute_import, print_function
 
+import sys
 import argparse
 from datetime import datetime
 
@@ -59,8 +60,7 @@ def main():
     if len(sys.argv) < 2:
         parser.print_help(sys.stderr)
         import errno
-        sys.exit(errno.EINVAL)
-        return
+        raise SystemExit(errno.EINVAL)
 
     results = parser.parse_args()
 
diff --git a/test/test_scripts.py b/test/test_scripts.py
@@ -9,30 +9,57 @@
 
 import subprocess
 import unittest
+import sys
 import errno
+from abc import ABCMeta, abstractmethod
 
+from .config import *
 
-class TestCanScript(object):
+class CanScriptTest(unittest.TestCase):
 
-    def do_commands_exist(self):
+    @classmethod
+    def setUpClass(cls):
+        # clean out the argument list
+        sys.argv = sys.argv[:1]
+
+    __test__ = False
+
+    __metaclass__ = ABCMeta
+
+    #@unittest.skipUnless(IS_UNIX, "commands may only be available on unix")
+    def test_do_commands_exist(self):
         """This test calls each scripts once and veifies that the help
         can be read without any errors.
         """
         for command in self._commands():
             try:
-                subprocess.check_output(COMMANDS.spli(), stderr=subprocess.STDOUT)
+                subprocess.check_output(command.split(), stderr=subprocess.STDOUT)
             except subprocess.CalledProcessError as e:
                 self.assertEqual(e.returncode, errno.EINVAL,
-                    'Calling "{}" failed:\n{}'.format(command, e.output))
+                    'Calling "{}" failed (exit code was {} and not EINVAL/22):\n{}'
+                    .format(command, e.returncode, e.output))
 
-    def does_not_crash(self):
+    def test_does_not_crash(self):
         # test import
         module = self._import()
         # test main method
-        module.main()
+        with self.assertRaises(SystemExit) as cm:
+            module.main()
+            self.assertEqual(cm.exception.code, errno.EINVAL,
+                    'Calling main failed:\n{}'.format(command, e.output))
 
+    @abstractmethod
+    def _commands(self):
+        pass
 
-class TestLoggerScript(unittest.TestCase, TestCanScript):
+    @abstractmethod
+    def _import(self):
+        pass
+
+
+class TestLoggerScript(CanScriptTest):
+
+    __test__ = True
 
     def _commands(self):
         return (
@@ -46,7 +73,9 @@ def _import(self):
         return module
 
 
-class TestPlayerScript(unittest.TestCase, TestCanScript):
+class TestPlayerScript(CanScriptTest):
+
+    __test__ = True
 
     def _commands(self):
         return (
