From: Thomas Fillon <thomas@parisson.com>
Date: Fri, 14 Feb 2014 16:03:06 +0000 (+0100)
Subject: Fix #39
X-Git-Tag: 0.5.4~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=60709a0bdd0f6edf3b59078318e7c9a1b11cddde;p=timeside.git

Fix #39
---

diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py
index 32e3e2f..f0e649f 100644
--- 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 7982a50..324f773 100644
--- 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 e13408b..8150f24 100644
--- 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 3a9483a..186c43f 100644
--- 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 d96adb4..0b21f3e 100644
--- 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 df0d3d8..ef7614e 100644
--- 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 630f9b7..ab004fe 100644
--- 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 ac416ad..1c92afa 100644
--- 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()