clean up before release

22 files changed, 72 insertions, 68 deletions

diff --git a/ep_layer_letterpress.py b/ep_layer_letterpress.py
index 7319cb7..9a3ac0b 100644
--- a/ep_layer_letterpress.py
+++ b/ep_layer_letterpress.py
@@ -193,7 +193,7 @@ class LetterPress(model_layer.Layer):
         self.begin_render(ctx, width, height)
  
         ctx.scale(1.0/width, 1.0/height)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         pango_ctx = pangocairo.CairoContext(ctx)
         points = self.sampler.get_sample_points()
         if len(points) > 0:
diff --git a/ep_merger_combine.py b/ep_merger_combine.py
index d07266a..cd4d4d2 100644
--- a/ep_merger_combine.py
+++ b/ep_merger_combine.py
@@ -157,18 +157,18 @@ class CombineMerger(model_allele.Allele):
         pre: width == height
         """
         ctx.save()
-        ka_debug.matrix_s(ctx.get_matrix())
+#        ka_debug.matrix_s(ctx.get_matrix())
         ctx.set_operator(self.left_operator)
         ctx.translate(-0.5, -0.5)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         ctx.scale(1.0/width, 1.0/height)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         ctx.set_source_surface(left_surface)
         ctx.paint_with_alpha(self.left_alphablending) # 0.5 .. 1.0
         ctx.set_operator(self.right_operator)
         ctx.set_source_surface(right_surface)
         ctx.paint_with_alpha(self.right_alphablending) # 0.5 .. 1.0
-        ka_debug.matrix_r(ctx.get_matrix())
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.restore()
 
     def explain_left(self, formater):
diff --git a/ep_merger_mask.py b/ep_merger_mask.py
index fc9478e..9095ace 100644
--- a/ep_merger_mask.py
+++ b/ep_merger_mask.py
@@ -137,17 +137,19 @@ class MaskMerger(model_allele.Allele):
         pre: width == height
         """
         ctx.save()
-        ka_debug.matrix_s(ctx.get_matrix())
+#        ka_debug.matrix_s(ctx.get_matrix())
         # draw 'left' layer using 'right' layer as mask
         ctx.set_operator(self.left_operator)
         ctx.translate(-0.5, -0.5)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         ctx.scale(1.0/width, 1.0/height)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         ctx.mask_surface(right_surface, 0, 0)
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.set_source_surface(left_surface)
+#        ka_debug.matrix(ctx.get_matrix())
         ctx.paint_with_alpha(self.left_alphablending) # 0.5 .. 1.0
-        ka_debug.matrix_r(ctx.get_matrix())
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.restore()
 
     def explain_left(self, formater):
diff --git a/ep_modifier_border.py b/ep_modifier_border.py
index a2db1c1..febbba0 100644
--- a/ep_modifier_border.py
+++ b/ep_modifier_border.py
@@ -106,18 +106,18 @@ class BorderModifier(model_allele.Allele):
                               (1.0-2.0*self.border_weight)*msk_height)
             msk_ctx.fill()
             ctx.save()
-            ka_debug.matrix_s(ctx.get_matrix())
+#            ka_debug.matrix_s(ctx.get_matrix())
             single_layer.render(task, ctx, width, height)
 #            msk_surface.write_to_png('/dev/shm/mask_' + self.get_unique_id() + '.png')
             ctx.mask_surface(msk_surface, -0.5*width, -0.5*height)
             single_treenode.render(task, ctx, width, height)
-            ka_debug.matrix_r(ctx.get_matrix())
+#            ka_debug.matrix_r(ctx.get_matrix())
             ctx.restore()
         except:
             ka_debug.err('failed calculating [%s] [%s] [%s]' % \
                    (self.get_unique_id(), sys.exc_info()[0], sys.exc_info()[1]))
             traceback.print_exc(file=sys.__stderr__)
-            ka_debug.matrix(ctx.get_matrix())
+#            ka_debug.matrix(ctx.get_matrix())
 
 
     def explain(self, task, formater, single_layer, single_treenode):
diff --git a/ep_modifier_flip.py b/ep_modifier_flip.py
index a7bc5ce..485e916 100644
--- a/ep_modifier_flip.py
+++ b/ep_modifier_flip.py
@@ -82,16 +82,16 @@ class FlipModifier(model_allele.Allele):
         """
         # paint one layer
         ctx.scale(self.xFlip, self.yFlip)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         ctx.save()
-        ka_debug.matrix_s(ctx.get_matrix())
+#        ka_debug.matrix_s(ctx.get_matrix())
         ctx.save()
-        ka_debug.matrix_s(ctx.get_matrix())
+#        ka_debug.matrix_s(ctx.get_matrix())
         single_layer.render(task, ctx, width, height)
-        ka_debug.matrix_r(ctx.get_matrix())
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.restore()
         single_treenode.render(task, ctx, width, height)
-        ka_debug.matrix_r(ctx.get_matrix())
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.restore()
 
     def explain(self, task, formater, single_layer, single_treenode):
diff --git a/ep_modifier_mask.py b/ep_modifier_mask.py
index 75db6e4..6761b29 100644
--- a/ep_modifier_mask.py
+++ b/ep_modifier_mask.py
@@ -108,7 +108,7 @@ class MaskModifier(model_allele.Allele):
         """
         # paint masked by an linear gradient
         ctx.save()
-        ka_debug.matrix_s(ctx.get_matrix())
+#        ka_debug.matrix_s(ctx.get_matrix())
 
         delta_x = self.direction.offset * math.cos(self.direction.radian)
         delta_y = self.direction.offset * math.sin(self.direction.radian)
@@ -118,16 +118,15 @@ class MaskModifier(model_allele.Allele):
                                       self.center.y_pos - delta_y - 0.5)
         linear.add_color_stop_rgba(1.0, 1.0, 1.0, 1.0, self.alpha1)
         linear.add_color_stop_rgba(0.0, 0.0, 0.0, 0.0, self.alpha2)
-#        ctx.mask(linear)
      
         ctx.save()
-        ka_debug.matrix_s(ctx.get_matrix())
+#        ka_debug.matrix_s(ctx.get_matrix())
         single_layer.render(task, ctx, width, height)
-        ka_debug.matrix_r(ctx.get_matrix())
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.restore()
         ctx.mask(linear)
         single_treenode.render(task, ctx, width, height)
-        ka_debug.matrix_r(ctx.get_matrix())
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.restore()
 
     def explain(self, task, formater, single_layer, single_treenode):
diff --git a/ep_modifier_rectangulartile.py b/ep_modifier_rectangulartile.py
index 75318fa..0aa8aca 100644
--- a/ep_modifier_rectangulartile.py
+++ b/ep_modifier_rectangulartile.py
@@ -90,23 +90,23 @@ class RectangularTileModifier(model_allele.Allele):
                 if task.quit:
                     return
                 ctx.save()
-                ka_debug.matrix_s(ctx.get_matrix())
+#                ka_debug.matrix_s(ctx.get_matrix())
                 ctx.translate((tix-0.5*self.x_tiles)*delta_x+0.5*delta_x, \
                               (tiy-0.5*self.y_tiles)*delta_y+0.5*delta_y)
-                ka_debug.matrix(ctx.get_matrix())
+#                ka_debug.matrix(ctx.get_matrix())
                 ctx.scale(delta_x, delta_y)
-                ka_debug.matrix(ctx.get_matrix())
+#                ka_debug.matrix(ctx.get_matrix())
                 ctx.save()
                 ka_debug.matrix_s(ctx.get_matrix())
                 ctx.save()
-                ka_debug.matrix_s(ctx.get_matrix())
+#                ka_debug.matrix_s(ctx.get_matrix())
                 single_layer.render(task, ctx, width, height)
-                ka_debug.matrix_r(ctx.get_matrix())
+#                ka_debug.matrix_r(ctx.get_matrix())
                 ctx.restore()
                 single_treenode.render(task, ctx, width, height)
-                ka_debug.matrix_r(ctx.get_matrix())
+#                ka_debug.matrix_r(ctx.get_matrix())
                 ctx.restore()
-                ka_debug.matrix_r(ctx.get_matrix())
+#                ka_debug.matrix_r(ctx.get_matrix())
                 ctx.restore()
 
     def explain(self, task, formater, single_layer, single_treenode):
diff --git a/ep_page_ancestors.py b/ep_page_ancestors.py
index c4c28c2..ea8ef4d 100644
--- a/ep_page_ancestors.py
+++ b/ep_page_ancestors.py
@@ -137,23 +137,23 @@ class AncestorsController(object):
                 self._paint_connector(ctx, mx, my, x1, y1, my_parents[1])
 
                 ctx.save()
-                ka_debug.matrix_s(ctx.get_matrix())
+#                ka_debug.matrix_s(ctx.get_matrix())
                 ctx.scale(1.0/_SCALE, 1.0/_SCALE)
-                ka_debug.matrix(ctx.get_matrix())
+#                ka_debug.matrix(ctx.get_matrix())
                 self._paint_next(ctx, _SCALE*x0, _SCALE*y0, my_parents[0])
                 self._paint_next(ctx, _SCALE*x1, _SCALE*y1, my_parents[1])
-                ka_debug.matrix_r(ctx.get_matrix())
+#                ka_debug.matrix_r(ctx.get_matrix())
                 ctx.restore()
 
             if surface is not None:
 #                ka_debug.info('(xpos, ypos): %d, %d' % (xpos, ypos)) 
                 ctx.save()
-                ka_debug.matrix_s(ctx.get_matrix())
+#                ka_debug.matrix_s(ctx.get_matrix())
                 ctx.set_operator(cairo.OPERATOR_SOURCE)
                 ctx.rectangle(xpos-width/2, ypos, width, height)
                 ctx.clip()
                 ctx.set_source_surface(surface, xpos-width/2, ypos)
                 ctx.paint()
 #                ctx.reset_clip() #TODO Required argument 'cr' not found
-                ka_debug.matrix_r(ctx.get_matrix())
+#                ka_debug.matrix_r(ctx.get_matrix())
                 ctx.restore()
diff --git a/ep_page_zoom.py b/ep_page_zoom.py
index 3df411c..e2f6ba3 100644
--- a/ep_page_zoom.py
+++ b/ep_page_zoom.py
@@ -128,6 +128,9 @@ class ZoomController(object):
         """
         if self._surface is not None:
             ctx = ka_controller.create_context(widget)
+#            ctx.set_operator(cairo.OPERATOR_CLEAR)
+#            ctx.paint()
             ctx.set_operator(cairo.OPERATOR_SOURCE)
+#            ctx.set_operator(cairo.OPERATOR_OVER)
             ctx.set_source_surface(self._surface)
             ctx.paint()
diff --git a/ep_stamp_svg.py b/ep_stamp_svg.py
index 51e6536..a9d18e0 100644
--- a/ep_stamp_svg.py
+++ b/ep_stamp_svg.py
@@ -167,15 +167,15 @@ class SvgStamp(model_allele.Allele):
                                             (state + rx) % len(self.mapping)]
                                           % len(svg_image_list)]
                 ctx.save()
-                ka_debug.matrix_s(ctx.get_matrix())
+#                ka_debug.matrix_s(ctx.get_matrix())
                 svg = rsvg.Handle(file=svg_pathname)
                 ctx.translate(-self.dw/2.0+point[0], -self.dh/2.0+point[1])
-                ka_debug.matrix(ctx.get_matrix())
+#                ka_debug.matrix(ctx.get_matrix())
                 ctx.scale(self.dw/100, self.dh/100)
-                ka_debug.matrix(ctx.get_matrix())
+#                ka_debug.matrix(ctx.get_matrix())
                 svg.render_cairo(ctx)
                 svg.close()
-                ka_debug.matrix_r(ctx.get_matrix())
+#                ka_debug.matrix_r(ctx.get_matrix())
                 ctx.restore()
 
     def explain(self):
diff --git a/exon_direction.py b/exon_direction.py
index c18f868..030e25b 100644
--- a/exon_direction.py
+++ b/exon_direction.py
@@ -109,7 +109,7 @@ class Direction(model_allele.Allele):
         surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
         ctx = cairo.Context(surface)
         ctx.scale(width, height)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         # paint background
         ctx.set_operator(cairo.OPERATOR_OVER)
         ctx.set_source_rgb(1.0, 1.0, 1.0)
diff --git a/exon_position.py b/exon_position.py
index 12c0976..899762e 100644
--- a/exon_position.py
+++ b/exon_position.py
@@ -108,7 +108,7 @@ class Position(model_allele.Allele):
         surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
         ctx = cairo.Context(surface)
         ctx.scale(width, height)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         # paint background
         ctx.set_operator(cairo.OPERATOR_OVER)
         ctx.set_source_rgb(1.0, 1.0, 1.0)
diff --git a/ka_controller.py b/ka_controller.py
index 21ad7bc..a1139e8 100644
--- a/ka_controller.py
+++ b/ka_controller.py
@@ -142,7 +142,7 @@ class KandidController(object):
         if is_sensitive:
             dummy, moderate, poor = self.model.classify()
             is_sensitive = len(poor) > 0 and len(moderate) > 0
-        ka_debug.info('_update_generate_buttons %s' % is_sensitive)
+#        ka_debug.info('_update_generate_buttons %s' % is_sensitive)
         self._widget_tree.get_widget('breedGenerationButton'). \
                                                   set_sensitive(is_sensitive)
         self._widget_tree.get_widget('randomGenerationButton'). \
diff --git a/ka_debug.py b/ka_debug.py
index 03ed3f1..78769d7 100644
--- a/ka_debug.py
+++ b/ka_debug.py
@@ -33,7 +33,6 @@ _try_once, locale_testrun = False, False
 if os.path.exists(DEBUG_ACTIVITY_PATH):
     locale_testrun = True
     _try_once = True
-    _try_once = False
 
 is_DbC_activated = False
 
diff --git a/ka_html_page.py b/ka_html_page.py
index 139af42..90a73c5 100644
--- a/ka_html_page.py
+++ b/ka_html_page.py
@@ -108,7 +108,7 @@ class HtmlPage(object):
         Lazy evaluation to fill the page with text.
         pre: len(args) >= 3
         """
-        ka_debug.info('on_notebook_switch_page %s' % (args[2]))
+#        ka_debug.info('on_notebook_switch_page %s' % (args[2]))
         self._my_page = args[2] == self._page_number
         if self._my_page and self._empty:
             try:
diff --git a/ka_importer.py b/ka_importer.py
index 03b5835..765899c 100644
--- a/ka_importer.py
+++ b/ka_importer.py
@@ -164,7 +164,7 @@ def _create_icon(is_plus_sign):
     surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
     ctx = cairo.Context(surface)
     ctx.scale(width, height)
-    ka_debug.matrix(ctx.get_matrix())
+#    ka_debug.matrix(ctx.get_matrix())
     # paint background
     ctx.set_operator(cairo.OPERATOR_OVER)
     ctx.set_source_rgb(1.0, 1.0, 1.0)
diff --git a/ka_utils.py b/ka_utils.py
index 91e2778..642a2fb 100644
--- a/ka_utils.py
+++ b/ka_utils.py
@@ -34,7 +34,7 @@ def explain_points(head, points):
     surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, ICON_WIDTH, ICON_HEIGHT)
     ctx = cairo.Context(surface)
     ctx.scale(ICON_WIDTH, ICON_HEIGHT)
-    ka_debug.matrix(ctx.get_matrix())
+#    ka_debug.matrix(ctx.get_matrix())
     # paint background
     ctx.set_operator(cairo.OPERATOR_OVER)
     ctx.set_source_rgb(1.0, 1.0, 1.0)
diff --git a/model_constraintpool.py b/model_constraintpool.py
index 6a9e210..91ad99b 100644
--- a/model_constraintpool.py
+++ b/model_constraintpool.py
@@ -133,17 +133,18 @@ class ConstraintPool(object):
 
     def _my_defaults(self):
         #TODO read from persistence, provide an constraint editor
-        self.set('*', 'samplertypeconstraint', ['affineifs',])
+#        self.set('*', 'samplertypeconstraint', ['affineifs',])
+#        self.set('*', 'mergertypeconstraint', ['combine',])
 #        self.set('*', 'layertypeconstraint', ['filledspline', ])
 #        self.set('*', 'layertypeconstraint', ['lca', ])
 #        self.set('*', 'modifiertypeconstraint', ['flip', ])
 #        self.set('*', 'modifiertypeconstraint', ['border', ])
 #        self.set('*', 'stamptypeconstraint', ['filledcyclic',])
-        self.set('*', 'layertypeconstraint', ['markovchain', ])
+#        self.set('*', 'layertypeconstraint', ['markovchain', ])
 #        self.set('*', 'samplertypeconstraint', ['randomwalk',])
 #        self.set('*', 'layertypeconstraint', ['referencepattern', ])
 #        self.set('*', 'modifiertypeconstraint', ['border', ])
-        self.set('*', 'modifiertypeconstraint', ['mask', ])
+#        self.set('*', 'mergertypeconstraint', ['mask', ])
 #        self.set('*', 'layertypeconstraint', ['quadtree', ])
 #        self.set('*', 'colorconstraint', ['colorconstraint_none', ])
 #        self.set('*', 'layertypeconstraint', ['voronoidiagram', 'markovchain', ])
diff --git a/model_protozoon.py b/model_protozoon.py
index bc366bc..8bd7d61 100644
--- a/model_protozoon.py
+++ b/model_protozoon.py
@@ -91,21 +91,21 @@ class Protozoon(model_allele.Allele):
         pre: width == height
         """
         ctx.save()
-        ka_debug.matrix_s(ctx.get_matrix())
+#        ka_debug.matrix_s(ctx.get_matrix())
         ctx.scale(width, height)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         ctx.translate(0.5, 0.5)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         
         # paint background
 #        ctx.set_operator(cairo.OPERATOR_CLEAR)
         ctx.set_operator(cairo.OPERATOR_SOURCE)
         rgb = self.background.rgba
-        ctx.set_source_rgb(rgb[0], rgb[1], rgb[2])
+        ctx.set_source_rgba(rgb[0], rgb[1], rgb[2], 1.0)
         ctx.paint()
 
         self.treenode.render(task, ctx, width, height)
-        ka_debug.matrix_r(ctx.get_matrix())
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.restore()
 
     def explain(self, task, formater):
diff --git a/model_treenode.py b/model_treenode.py
index 917ec64..99f0174 100644
--- a/model_treenode.py
+++ b/model_treenode.py
@@ -259,7 +259,7 @@ class TreeNode(model_allele.Allele):
 #!!        time.sleep(0.001)
         try:
             ctx.save()
-            ka_debug.matrix_s(ctx.get_matrix())
+#            ka_debug.matrix_s(ctx.get_matrix())
             if (self.left_treenode is None) and (self.right_treenode is None):
                 # I am a leaf, use my own layer painting strategy
                 self.layer.render(task, ctx, width, height)
@@ -284,22 +284,22 @@ class TreeNode(model_allele.Allele):
             elif (self.left_treenode is None) and (self.right_treenode is not None):
                 self.modifier.render_single_layer(task, self.layer, self.right_treenode, 
                                                   ctx, width, height)
-            ka_debug.matrix_r(ctx.get_matrix())
+#            ka_debug.matrix_r(ctx.get_matrix())
             ctx.restore()
         except:
             ka_debug.err('failed calculating [%s] [%s] [%s]' % \
                    (self.get_unique_id(), sys.exc_info()[0], sys.exc_info()[1]))
             traceback.print_exc(file=sys.__stderr__)
-            ka_debug.matrix(ctx.get_matrix())
+#            ka_debug.matrix(ctx.get_matrix())
 
     def _prepare_surface(self, ctx, width, height, background):
         new_surface = ctx.get_target().create_similar(cairo.CONTENT_COLOR_ALPHA, 
                                                       width, height)
         new_ctx = cairo.Context(new_surface)
         new_ctx.scale(width, height)
-        ka_debug.matrix(new_ctx.get_matrix())
+#        ka_debug.matrix(new_ctx.get_matrix())
         new_ctx.translate(0.5, 0.5)
-        ka_debug.matrix(new_ctx.get_matrix())
+#        ka_debug.matrix(new_ctx.get_matrix())
         new_ctx.set_operator(cairo.OPERATOR_SOURCE)
         rgba = background.rgba
         new_ctx.set_source_rgba(rgba[0], rgba[1], rgba[2], rgba[3])
@@ -356,15 +356,15 @@ class TreeNode(model_allele.Allele):
         surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
         ctx = cairo.Context(surface)
         ctx.scale(width, height)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         ctx.translate(0.5, 0.5)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         TreeNode._paint_checker_board(ctx)
         ctx.save()
-        ka_debug.matrix_s(ctx.get_matrix())
+#        ka_debug.matrix_s(ctx.get_matrix())
         source.render(task, ctx, width, height)
         formater.surface_item(surface, 'Tree node ' + self.path, self.path)
-        ka_debug.matrix_r(ctx.get_matrix())
+#        ka_debug.matrix_r(ctx.get_matrix())
         ctx.restore()
 
     def copy(self):
diff --git a/test_model.py b/test_model.py
index 28d877c..7ccfedb 100644
--- a/test_model.py
+++ b/test_model.py
@@ -485,7 +485,7 @@ class TestKandidModel(unittest.TestCase):
         surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
         ctx = cairo.Context(surface)
         ctx.scale(width, height)
-        ka_debug.matrix(ctx.get_matrix())
+#        ka_debug.matrix(ctx.get_matrix())
         # paint background
         ctx.set_operator(cairo.OPERATOR_SOURCE)
         ctx.set_source_rgb(0.0, 0.0, 0.0)
diff --git a/test_suite.py b/test_suite.py
index 1d9d1e8..b9e3cf8 100644
--- a/test_suite.py
+++ b/test_suite.py
@@ -34,10 +34,10 @@ gtk.gdk.threads_init()
 alltests = unittest.TestSuite((\
              unittest.makeSuite(test_buildingblocks.TestKandidBuildingBlocks), \
              unittest.makeSuite(test_layer.TestKandidLayer), \
-#             unittest.makeSuite(test_exporter.TestKandidExporter), \
-#             unittest.makeSuite(test_status.TestKandidStatus), \
-#             unittest.makeSuite(test_history.TestKandidHistory), \
-#             unittest.makeSuite(test_pages.TestKandidPages), \
-#             unittest.makeSuite(test_model.TestKandidModel), \
+             unittest.makeSuite(test_exporter.TestKandidExporter), \
+             unittest.makeSuite(test_status.TestKandidStatus), \
+             unittest.makeSuite(test_history.TestKandidHistory), \
+             unittest.makeSuite(test_pages.TestKandidPages), \
+             unittest.makeSuite(test_model.TestKandidModel), \
                              ))
 unittest.TextTestRunner(verbosity=2).run(alltests)