Fix #39

diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py
index 32e3e2fbddcc25cb44bf269ed905f952704a100e..f0e649f3cff1bbdbc8dd67531f963d5f4450e14d 100644 (file)
--- a/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@ -1093,9 +1093,5 @@ class Analyzer(Processor):
 
 
 if __name__ == "__main__":
-    # Run doctest from __main__ and unittest from tests
-    from tests.unit_timeside import run_test_module
-    # load corresponding tests
-    from tests import test_AnalyzerResult
-
-    run_test_module([test_AnalyzerResult])
+    import doctest
+    doctest.testmod()

diff --git a/timeside/analyzer/preprocessors.py b/timeside/analyzer/preprocessors.py
index 7982a5053df68070653fcfa3fc771872972d0f29..324f7732f1c374afc6aa48b2221ade79e8bdb759 100644 (file)
--- a/timeside/analyzer/preprocessors.py
+++ b/timeside/analyzer/preprocessors.py
@@ -179,7 +179,5 @@ def frames_adapter(process_func):
 
 
 if __name__ == "__main__":
-    # Run doctest from __main__ and unittest from test_analyzer_preprocessors
-    from tests import test_analyzer_preprocessors
-    from tests.unit_timeside import run_test_module
-    run_test_module(test_analyzer_preprocessors)
+    import doctest
+    doctest.testmod()

diff --git a/timeside/decoder/array.py b/timeside/decoder/array.py
index e13408b249d23193322f2bba257a8df33e7cb690..8150f24ebb1a87c672e786358322c599bd119b04 100644 (file)
--- a/timeside/decoder/array.py
+++ b/timeside/decoder/array.py
@@ -137,9 +137,5 @@ class ArrayDecoder(Decoder):
 
 
 if __name__ == "__main__":
-    # Run doctest from __main__ and unittest from tests
-    from tests.unit_timeside import run_test_module
-    # load corresponding tests
-    from tests import test_array_decoding
-
-    run_test_module([test_array_decoding])
+    import doctest
+    doctest.testmod()

diff --git a/timeside/decoder/file.py b/timeside/decoder/file.py
index 3a9483a7ded4c9cd1dc0bf5f9877e7e430cebff9..186c43f8b2892f49a981892c12e9009f4ed395cd 100644 (file)
--- a/timeside/decoder/file.py
+++ b/timeside/decoder/file.py
@@ -331,9 +331,5 @@ class FileDecoder(Decoder):
 
 
 if __name__ == "__main__":
-    # Run doctest from __main__ and unittest from tests
-    from tests.unit_timeside import run_test_module
-    # load corresponding tests
-    from tests import test_decoding
-
-    run_test_module([test_decoding])
+    import doctest
+    doctest.testmod()

diff --git a/timeside/decoder/utils.py b/timeside/decoder/utils.py
index d96adb44fa2adec89c3e10ca96476539f54cef25..0b21f3ec48b9c81ccc48d16ea0c6d4112f28d883 100644 (file)
--- a/timeside/decoder/utils.py
+++ b/timeside/decoder/utils.py
@@ -152,10 +152,5 @@ def stack(process_func):
 
 
 if __name__ == "__main__":
-    # Run doctest from __main__ and unittest from tests
-    from tests.unit_timeside import run_test_module
-    # load corresponding tests
-    from tests import test_decoder_utils
-
-    run_test_module(test_decoder_utils)
-
+    import doctest
+    doctest.testmod()

diff --git a/timeside/encoder/core.py b/timeside/encoder/core.py
index df0d3d8f09303b6918d9a749027a7f354463a083..ef7614e43d9064e144ddac8ebb085cc59378772c 100644 (file)
--- a/timeside/encoder/core.py
+++ b/timeside/encoder/core.py
@@ -188,7 +188,5 @@ class GstEncoder(Processor):
             raise TypeError('function only available in streaming mode')
 
 if __name__ == "__main__":
-    # Run doctest from __main__ and unittest from test_analyzer_preprocessors
-    from tests import test_encoding, test_transcoding
-    from tests.unit_timeside import run_test_module
-    run_test_module([test_encoding, test_transcoding])
+    import doctest
+    doctest.testmod()

diff --git a/timeside/encoder/webm.py b/timeside/encoder/webm.py
index 630f9b7852614fc8ae15efe497069da522c91226..ab004feaf4700403c3a68b15f2d8f210ab50d9d8 100644 (file)
--- a/timeside/encoder/webm.py
+++ b/timeside/encoder/webm.py
@@ -93,7 +93,5 @@ class WebMEncoder(GstEncoder):
         self.metadata = metadata
 
 if __name__ == "__main__":
-    # Run doctest from __main__ and unittest from test_analyzer_preprocessors
-    from tests import test_encoding, test_transcoding
-    from tests.unit_timeside import run_test_module
-    run_test_module([test_encoding, test_transcoding], test_prefix='testWebM')
\ No newline at end of file
+    import doctest
+    doctest.testmod()

diff --git a/timeside/grapher/core.py b/timeside/grapher/core.py
index ac416adf0c1df4f42603a34336d9cac44d6e4df9..1c92afa247e9da906effdd0f9078229ca4789e04 100644 (file)
--- a/timeside/grapher/core.py
+++ b/timeside/grapher/core.py
@@ -286,7 +286,6 @@ class Grapher(Processor):
                 self.previous_x, self.previous_y = x, y
 
 
-
 if __name__ == "__main__":
     import doctest
-    doctest.testmod()
\ No newline at end of file
+    doctest.testmod()