Changeset 29235 for branches/sc_branches/psps_testing/psi/psi_inquisitor.py

Timestamp:

Sep 24, 2010, 3:50:36 PM (16 years ago)

Author:

Serge CHASTEL

Message:

Improved unit tests/code coverage. Some refactoring

File:

• branches/sc_branches/psps_testing/psi/psi_inquisitor.py (modified) (2 diffs)

branches/sc_branches/psps_testing/psi/psi_inquisitor.py

@@ -135 +135 @@
                 # position...
                 values = line.split(',')
-                if len(values) != len(contents['fields']):
-                    # I wonder if this test is relevant.
-                    # We should trust the server response at least
-                    # at the protocol level...
+                if len(values) != len(contents['fields']): # pragma: no cover
+                    # I wonder if this test is relevant.  We should
+                    # trust the server response at least at the
+                    # protocol level...
                     raise Exception("Different array length? %d vs %d" 
                                     % (len(values), len(contents['fields'])))
@@ -154 +154 @@
 if __name__ == '__main__':
     import logging
-    PsPsLogger.set_stderr()
-    PsPsLogger.setLevel(logging.DEBUG)
-    import doctest
-    doctest.testmod()
+    import sys
+    PsPsLogger.setLevel(logging.INFO)
+    PsPsLogger.set_stdout()
+    current_argument_position = 1
+    while current_argument_position < len(sys.argv):
+        if sys.argv[current_argument_position] == '-debug': # pragma: no cover
+            PsPsLogger.set_stderr()
+            current_argument_position += 1
+        elif sys.argv[current_argument_position] == 'test':
+            print 'Running unittest for PsiInquisitor class'
+            import doctest
+            doctest.testmod(exclude_empty = True)
+            sys.exit(0)