Moved argument parsing in tests to separate file.

tests/basic.py

@@ -1,32 +1,8 @@
-import argparse
-import logging
-
 from src.server import GestureServer
 from src.window import FullscreenWindow
 from src.trackers.basic import BasicTracker
-from src.logger import Logger
-
-
-# Parse arguments
-parser = argparse.ArgumentParser(description='Basic test program for usage '
-                                             'of multi-touch API.')
-parser.add_argument('--log', metavar='LOG_LEVEL', default='INFO',
-                    choices=['DEBUG', 'INFO', 'WARNING'],
-                    help='set log level (defaults to INFO)')
-parser.add_argument('--logfile', metavar='FILENAME',
-                    help='filename for the log file (the log is printed to '
-                         'stdout by default)')
-args = parser.parse_args()
-
-
-# Configure logger
-log_config = {'level': getattr(logging, args.log)}
-
-if args.logfile:
-    log_config['filename'] = args.logfile
-
-Logger.configure(**log_config)
 
+import tests.parse_arguments
 
 # Create server
 server = GestureServer()

tests/parse_arguments.py

@@ -0,0 +1,24 @@
+import argparse
+import logging
+
+from src.logger import Logger
+
+# Parse arguments
+parser = argparse.ArgumentParser(description='Basic test program for usage '
+                                             'of multi-touch API.')
+parser.add_argument('--log', metavar='LOG_LEVEL', default='INFO',
+                    choices=['DEBUG', 'INFO', 'WARNING'],
+                    help='set log level (defaults to INFO)')
+parser.add_argument('--logfile', metavar='FILENAME',
+                    help='filename for the log file (the log is printed to '
+                         'stdout by default)')
+args = parser.parse_args()
+
+
+# Configure logger
+log_config = {'level': getattr(logging, args.log)}
+
+if args.logfile:
+    log_config['filename'] = args.logfile
+
+Logger.configure(**log_config)

tests/tap.py

@@ -1,32 +1,8 @@
-import argparse
-import logging
-
 from src.server import GestureServer
 from src.window import FullscreenWindow
 from src.trackers.tap import TapTracker
-from src.logger import Logger
-
-
-# Parse arguments
-parser = argparse.ArgumentParser(description='Basic test program for usage '
-                                             'of multi-touch API.')
-parser.add_argument('--log', metavar='LOG_LEVEL', default='INFO',
-                    choices=['DEBUG', 'INFO', 'WARNING'],
-                    help='set log level (defaults to INFO)')
-parser.add_argument('--logfile', metavar='FILENAME',
-                    help='filename for the log file (the log is printed to '
-                         'stdout by default)')
-args = parser.parse_args()
-
-
-# Configure logger
-log_config = {'level': getattr(logging, args.log)}
-
-if args.logfile:
-    log_config['filename'] = args.logfile
-
-Logger.configure(**log_config)
 
+import tests.parse_arguments
 
 # Create server
 server = GestureServer()