Merge of jc and origin jc

Merge branch 'jc' of ssh://bobthebuilder.mine.nu:8080/home/git into jc

Conflicts:

	source/external/source/sugar-toolkit/src/sugar/activity/activity.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/Makefile.am
	source/external/source/sugar-toolkit/src/sugar/tutorius/bundler.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py

1 files changed, 4 insertions, 24 deletions

diff --git a/src/sugar/tutorius/tests/run-tests.py b/src/sugar/tutorius/tests/run-tests.py
index 2e200c2..0c9219b 100755
--- a/src/sugar/tutorius/tests/run-tests.py
+++ b/src/sugar/tutorius/tests/run-tests.py
@@ -10,17 +10,10 @@ sys.path.insert(0,
 )
 
 FULL_PATH = os.path.join(INSTALL_PATH,"sugar/tutorius")
-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:
-        ret += glob(os.path.join(FULL_PATH,dir,"*.py"))
-    return ret
-
 import sys
 if __name__=='__main__':
     if "--coverage" in sys.argv:
@@ -35,38 +28,25 @@ if __name__=='__main__':
         import gtkutilstests
         import overlaytests
         import linear_creatortests
-        import actiontests
-        import uamtests
-        import filterstests
-        import constraintstests
-        import propertiestests
-
+        import serializertests
+        
         suite = unittest.TestSuite()
         suite.addTests(unittest.findTestCases(coretests))
         suite.addTests(unittest.findTestCases(servicestests))
         suite.addTests(unittest.findTestCases(gtkutilstests))
         suite.addTests(unittest.findTestCases(overlaytests))
         suite.addTests(unittest.findTestCases(linear_creatortests))
-        suite.addTests(unittest.findTestCases(actiontests))
-        suite.addTests(unittest.findTestCases(uamtests))
-        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.report(glob(GLOB_PATH))
         coverage.erase()
     else:
         from coretests import *
         from servicestests import *
         from gtkutilstests import *
         from overlaytests import *
-        from actiontests import *
-        from linear_creatortests import *
-        from uamtests import *
-        from filterstests import *
 
         unittest.main()