From 5997b56f004cea4d7ee344f47e6ba2f41e10f119 Mon Sep 17 00:00:00 2001
From: Thomas Jourdan <b.vehikel@googlemail.com>
Date: Mon, 25 Jan 2010 17:14:52 +0000
Subject: Cancel obsolete rendering task during start up. This may reduce time when starting from journal.

---
(limited to 'test_suite.py')

diff --git a/test_suite.py b/test_suite.py
index d825cd8..0cb211f 100644
--- a/test_suite.py
+++ b/test_suite.py
@@ -103,19 +103,19 @@ class TestKandidModel(unittest.TestCase):
     def test_task(self):
         global _test_task_completed_count
         _test_task_completed_count = 0
-        ka_task.GeneratorTask(self.task_1, self.on_completed).start()
+        ka_task.GeneratorTask(self.task_1, self.on_completed, 'n1').start()
         time.sleep(5)
         self.assertTrue(ka_task.GeneratorTask.is_completed())
-        ka_task.GeneratorTask(self.task_2, self.on_completed).start()
+        ka_task.GeneratorTask(self.task_2, self.on_completed, 'n2').start()
         time.sleep(5)
         self.assertTrue(ka_task.GeneratorTask.is_completed())
         #TODO gtk main loop is not running. on_completed will not be executed
         #self.assertEqual(1, _test_task_completed_count)
 
-    def task_1(self, *args, **kwargs):
+    def task_1(self, task, *args, **kwargs):
         print 'leave 1', _test_task_completed_count
 
-    def task_2(self, *args, **kwargs):
+    def task_2(self, task, *args, **kwargs):
         raise Exception
         print 'leave 2', _test_task_completed_count
 
@@ -195,12 +195,15 @@ class TestKandidModel(unittest.TestCase):
             formater = ka_extensionpoint.create(ep_key, base_name,
                                                 a_protozoon.get_unique_id(),
                                                 base_folder)
-            a_protozoon.explain(formater)
+            class DummyTask:
+                def __init__(self):
+                    self.quit = False
+            a_protozoon.explain(DummyTask(), formater)
 
             file_path = formater.get_pathname('html')
             formater.write_html_file(file_path)
             exit_code = os.spawnvp(os.P_WAIT,
-                                   'tidy', ['tidy', '-i', file_path])
+                            'tidy', ['tidy', '-i', '-q', '-w',  '255', file_path])
             self.assertEqual(0, exit_code)
 
     def test_locus(self):
--
cgit v0.9.1