From: Paul Brossier <piem@piem.org>
Date: Thu, 1 Nov 2018 01:11:08 +0000 (+0100)
Subject: [tests] avoid some imports, add missing main
X-Git-Tag: 0.4.9~71^2~53
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=fc144a51298f7ba6eb28e3ad2cdadb088231f199;p=aubio.git

[tests] avoid some imports, add missing main
---

diff --git a/python/tests/test_aubio.py b/python/tests/test_aubio.py
index 98a61154..5768cac9 100755
--- a/python/tests/test_aubio.py
+++ b/python/tests/test_aubio.py
@@ -1,6 +1,5 @@
 #! /usr/bin/env python
 
-from unittest import main
 from numpy.testing import TestCase
 
 class aubiomodule_test_case(TestCase):
@@ -15,5 +14,5 @@ class aubiomodule_test_case(TestCase):
         self.assertEqual('0', aubio.version[0])
 
 if __name__ == '__main__':
+    from unittest import main
     main()
-
diff --git a/python/tests/test_aubio_cmd.py b/python/tests/test_aubio_cmd.py
index 44e16fb3..471ac85c 100755
--- a/python/tests/test_aubio_cmd.py
+++ b/python/tests/test_aubio_cmd.py
@@ -1,8 +1,7 @@
 #! /usr/bin/env python
 
-import aubio.cmd
-from nose2 import main
 from numpy.testing import TestCase
+import aubio.cmd
 
 class aubio_cmd(TestCase):
 
@@ -31,4 +30,5 @@ class aubio_cmd_utils(TestCase):
                 "3200\t")
 
 if __name__ == '__main__':
+    from unittest import main
     main()
diff --git a/python/tests/test_aubio_cut.py b/python/tests/test_aubio_cut.py
index cbbfe05f..01ad2c6f 100755
--- a/python/tests/test_aubio_cut.py
+++ b/python/tests/test_aubio_cut.py
@@ -1,7 +1,6 @@
 #! /usr/bin/env python
 
 import aubio.cut
-from nose2 import main
 from numpy.testing import TestCase
 
 class aubio_cut(TestCase):
@@ -13,4 +12,5 @@ class aubio_cut(TestCase):
         assert self.a_parser.parse_args(['-v']).verbose
 
 if __name__ == '__main__':
+    from unittest import main
     main()
diff --git a/python/tests/test_cvec.py b/python/tests/test_cvec.py
index 5632784d..73ee6549 100755
--- a/python/tests/test_cvec.py
+++ b/python/tests/test_cvec.py
@@ -1,6 +1,5 @@
 #! /usr/bin/env python
 
-from unittest import main
 import numpy as np
 from numpy.testing import TestCase, assert_equal
 from aubio import cvec, fvec, float_type
@@ -141,4 +140,5 @@ class aubio_cvec_wrong_norm_input(TestCase):
             a.norm = np.zeros((512//2+1, 2), dtype = float_type)
 
 if __name__ == '__main__':
+    from unittest import main
     main()
diff --git a/python/tests/test_dct.py b/python/tests/test_dct.py
index 0c990f9f..c9b2ba7a 100755
--- a/python/tests/test_dct.py
+++ b/python/tests/test_dct.py
@@ -66,3 +66,7 @@ class aubio_dct(TestCase):
                 aubio.dct(size)
         except AssertionError:
             self.skipTest('creating aubio.dct with size %d did not fail' % size)
+
+if __name__ == '__main__':
+    from unittest import main
+    main()
diff --git a/python/tests/test_fvec.py b/python/tests/test_fvec.py
index 60623ac9..765c9fed 100755
--- a/python/tests/test_fvec.py
+++ b/python/tests/test_fvec.py
@@ -1,6 +1,5 @@
 #! /usr/bin/env python
 
-from unittest import main
 import numpy as np
 from numpy.testing import TestCase, assert_equal, assert_almost_equal
 from aubio import fvec, zero_crossing_rate, alpha_norm, min_removal
@@ -148,4 +147,5 @@ class aubio_fvec_test_memory(TestCase):
         del c
 
 if __name__ == '__main__':
+    from unittest import main
     main()