From 6fa568daae3291c7a876cd903f04079a12945dcb Mon Sep 17 00:00:00 2001
From: mike <michael.jmontcalm@gmail.com>
Date: Tue, 05 May 2009 05:44:27 +0000
Subject: Merge branch 'mike'

Conflicts:
	source/external/source/sugar-toolkit/src/sugar/tutorius/actions.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
---
(limited to 'src/sugar/tutorius/tests/run-tests.py')

diff --git a/src/sugar/tutorius/tests/run-tests.py b/src/sugar/tutorius/tests/run-tests.py
index 87edd57..042b10e 100755
--- a/src/sugar/tutorius/tests/run-tests.py
+++ b/src/sugar/tutorius/tests/run-tests.py
@@ -14,7 +14,6 @@ SUBDIRS = ["uam"]
 GLOB_PATH = os.path.join(FULL_PATH,"*.py")
 import unittest
 from glob import glob
-
 def report_files():
     ret = glob(GLOB_PATH)
     for dir in SUBDIRS:
@@ -40,6 +39,7 @@ if __name__=='__main__':
         import filterstests
         import constraintstests
         import propertiestests
+        import serializertests
         suite = unittest.TestSuite()
         suite.addTests(unittest.findTestCases(coretests))
         suite.addTests(unittest.findTestCases(servicestests))
@@ -51,10 +51,9 @@ if __name__=='__main__':
         suite.addTests(unittest.findTestCases(filterstests))
         suite.addTests(unittest.findTestCases(constraintstests))
         suite.addTests(unittest.findTestCases(propertiestests))
-        
+        suite.addTests(unittest.findTestCases(serializertests))
         runner = unittest.TextTestRunner()
         runner.run(suite)
-
         coverage.stop()
         coverage.report(report_files())
         coverage.erase()
@@ -70,5 +69,6 @@ if __name__=='__main__':
         from constraintstests import *
         from propertiestests import *
         from actiontests import *
+        from serializertests import *
 
         unittest.main()
--
cgit v0.9.1