summaryrefslogtreecommitdiff
path: root/tests/ecore
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2015-05-04 04:03:07 +0300
committerKai Huuhko <kai.huuhko@gmail.com>2015-05-04 04:03:07 +0300
commit4d73872f8ff021138cdce88655559ba624d767a9 (patch)
tree81fff70fe11d000b1377b26b0afcd6e575514fbe /tests/ecore
parente37026ec17f20fecf91145e43f9133a3131a59a1 (diff)
Removed init/shutdown calls from tests and examples
Diffstat (limited to 'tests/ecore')
-rw-r--r--tests/ecore/test_01_timer.py3
-rw-r--r--tests/ecore/test_02_animator.py1
-rw-r--r--tests/ecore/test_03_poller.py3
-rw-r--r--tests/ecore/test_04_idler.py7
-rw-r--r--tests/ecore/test_05_idle_enterer.py1
-rw-r--r--tests/ecore/test_06_idle_exiter.py3
-rw-r--r--tests/ecore/test_07_fd_handler.py1
-rw-r--r--tests/ecore/test_08_exe.py2
-rw-r--r--tests/ecore/test_09_file_download.py5
-rw-r--r--tests/ecore/test_10_file_monitor.py1
10 files changed, 8 insertions, 19 deletions
diff --git a/tests/ecore/test_01_timer.py b/tests/ecore/test_01_timer.py
index 8d48a34..3a3609d 100644
--- a/tests/ecore/test_01_timer.py
+++ b/tests/ecore/test_01_timer.py
@@ -39,7 +39,7 @@ class TestTimer(unittest.TestCase):
39 39
40 self.assertEqual(before1, after1) 40 self.assertEqual(before1, after1)
41 self.assertEqual(before2, after2) 41 self.assertEqual(before2, after2)
42 self.assertNotEqual(before3, after3) # already deleted 42 self.assertNotEqual(before3, after3) # already deleted
43 self.assertNotEqual(before4, after4) # already deleted 43 self.assertNotEqual(before4, after4) # already deleted
44 44
45 self.assertEqual(t1.is_deleted(), False) 45 self.assertEqual(t1.is_deleted(), False)
@@ -57,4 +57,3 @@ class TestTimer(unittest.TestCase):
57 57
58if __name__ == '__main__': 58if __name__ == '__main__':
59 unittest.main(verbosity=2) 59 unittest.main(verbosity=2)
60 ecore.shutdown()
diff --git a/tests/ecore/test_02_animator.py b/tests/ecore/test_02_animator.py
index 102cffe..1542d04 100644
--- a/tests/ecore/test_02_animator.py
+++ b/tests/ecore/test_02_animator.py
@@ -52,4 +52,3 @@ class TestAnimator(unittest.TestCase):
52 52
53if __name__ == '__main__': 53if __name__ == '__main__':
54 unittest.main(verbosity=2) 54 unittest.main(verbosity=2)
55 ecore.shutdown()
diff --git a/tests/ecore/test_03_poller.py b/tests/ecore/test_03_poller.py
index 12a243b..91e5d50 100644
--- a/tests/ecore/test_03_poller.py
+++ b/tests/ecore/test_03_poller.py
@@ -22,7 +22,7 @@ def poller_cb2(one, two, three, test):
22 22
23class TestPoller(unittest.TestCase): 23class TestPoller(unittest.TestCase):
24 def testInit(self): 24 def testInit(self):
25 25
26 p1 = ecore.Poller(4, poller_cb) 26 p1 = ecore.Poller(4, poller_cb)
27 p2 = ecore.Poller(2, poller_cb2, ecore.ECORE_POLLER_CORE, 27 p2 = ecore.Poller(2, poller_cb2, ecore.ECORE_POLLER_CORE,
28 "uno", "due", three="tre", test=self) 28 "uno", "due", three="tre", test=self)
@@ -41,4 +41,3 @@ class TestPoller(unittest.TestCase):
41 41
42if __name__ == '__main__': 42if __name__ == '__main__':
43 unittest.main(verbosity=2) 43 unittest.main(verbosity=2)
44 ecore.shutdown()
diff --git a/tests/ecore/test_04_idler.py b/tests/ecore/test_04_idler.py
index 895516e..711cd52 100644
--- a/tests/ecore/test_04_idler.py
+++ b/tests/ecore/test_04_idler.py
@@ -20,7 +20,7 @@ class TestIdler(unittest.TestCase):
20 20
21 self.assertIsInstance(i1, ecore.Idler) 21 self.assertIsInstance(i1, ecore.Idler)
22 self.assertIsInstance(i2, ecore.Idler) 22 self.assertIsInstance(i2, ecore.Idler)
23 23
24 before1 = i1.__repr__() 24 before1 = i1.__repr__()
25 before2 = i2.__repr__() 25 before2 = i2.__repr__()
26 26
@@ -36,8 +36,8 @@ class TestIdler(unittest.TestCase):
36 self.assertEqual(t.is_deleted(), True) 36 self.assertEqual(t.is_deleted(), True)
37 self.assertEqual(i1.is_deleted(), False) 37 self.assertEqual(i1.is_deleted(), False)
38 self.assertEqual(i2.is_deleted(), True) 38 self.assertEqual(i2.is_deleted(), True)
39 39
40 40
41 i1.delete() 41 i1.delete()
42 del t 42 del t
43 del i1 43 del i1
@@ -46,4 +46,3 @@ class TestIdler(unittest.TestCase):
46 46
47if __name__ == '__main__': 47if __name__ == '__main__':
48 unittest.main(verbosity=2) 48 unittest.main(verbosity=2)
49 ecore.shutdown()
diff --git a/tests/ecore/test_05_idle_enterer.py b/tests/ecore/test_05_idle_enterer.py
index fce9624..0c0037a 100644
--- a/tests/ecore/test_05_idle_enterer.py
+++ b/tests/ecore/test_05_idle_enterer.py
@@ -63,4 +63,3 @@ class TestIdleEnterer(unittest.TestCase):
63 63
64if __name__ == '__main__': 64if __name__ == '__main__':
65 unittest.main(verbosity=2) 65 unittest.main(verbosity=2)
66 ecore.shutdown()
diff --git a/tests/ecore/test_06_idle_exiter.py b/tests/ecore/test_06_idle_exiter.py
index bab08fa..61ddfaa 100644
--- a/tests/ecore/test_06_idle_exiter.py
+++ b/tests/ecore/test_06_idle_exiter.py
@@ -51,7 +51,7 @@ class TestIdleExiter(unittest.TestCase):
51 self.assertEqual(t.is_deleted(), True) 51 self.assertEqual(t.is_deleted(), True)
52 self.assertEqual(i1.is_deleted(), False) 52 self.assertEqual(i1.is_deleted(), False)
53 self.assertEqual(i2.is_deleted(), True) 53 self.assertEqual(i2.is_deleted(), True)
54 54
55 i1.delete() 55 i1.delete()
56 del i1 56 del i1
57 del i2 # already deleted since returned false 57 del i2 # already deleted since returned false
@@ -62,4 +62,3 @@ class TestIdleExiter(unittest.TestCase):
62 62
63if __name__ == '__main__': 63if __name__ == '__main__':
64 unittest.main(verbosity=2) 64 unittest.main(verbosity=2)
65 ecore.shutdown()
diff --git a/tests/ecore/test_07_fd_handler.py b/tests/ecore/test_07_fd_handler.py
index 3159998..3d4b103 100644
--- a/tests/ecore/test_07_fd_handler.py
+++ b/tests/ecore/test_07_fd_handler.py
@@ -37,4 +37,3 @@ class TestFdHandler(unittest.TestCase):
37 37
38if __name__ == '__main__': 38if __name__ == '__main__':
39 unittest.main(verbosity=2) 39 unittest.main(verbosity=2)
40 ecore.shutdown()
diff --git a/tests/ecore/test_08_exe.py b/tests/ecore/test_08_exe.py
index 8aff8e8..bde2571 100644
--- a/tests/ecore/test_08_exe.py
+++ b/tests/ecore/test_08_exe.py
@@ -84,5 +84,3 @@ class TestExe(unittest.TestCase):
84 84
85if __name__ == '__main__': 85if __name__ == '__main__':
86 unittest.main(verbosity=2) 86 unittest.main(verbosity=2)
87 ecore.shutdown()
88
diff --git a/tests/ecore/test_09_file_download.py b/tests/ecore/test_09_file_download.py
index 65cec70..83c2927 100644
--- a/tests/ecore/test_09_file_download.py
+++ b/tests/ecore/test_09_file_download.py
@@ -26,11 +26,10 @@ class TestFileDownload(unittest.TestCase):
26 ecore.FileDownload("http://www.google.com", dst, 26 ecore.FileDownload("http://www.google.com", dst,
27 completion_cb = _completion_cb, 27 completion_cb = _completion_cb,
28 progress_cb = _progress_cb) 28 progress_cb = _progress_cb)
29 29
30 ecore.main_loop_begin() 30 ecore.main_loop_begin()
31 31
32 32
33 33
34if __name__ == '__main__': 34if __name__ == '__main__':
35 unittest.main(verbosity=2) 35 unittest.main(verbosity=2)
36 ecore.shutdown()
diff --git a/tests/ecore/test_10_file_monitor.py b/tests/ecore/test_10_file_monitor.py
index 9d3519e..162e322 100644
--- a/tests/ecore/test_10_file_monitor.py
+++ b/tests/ecore/test_10_file_monitor.py
@@ -82,4 +82,3 @@ class TestFileMonitor(unittest.TestCase):
82 82
83if __name__ == '__main__': 83if __name__ == '__main__':
84 unittest.main(verbosity=2) 84 unittest.main(verbosity=2)
85 ecore.shutdown()