Merge branch 'tutorial_toolkit' into mike

Conflicts:

	source/activities/Writus.activity/TAbiWordActivity.py
	source/external/source/sugar-toolkit/src/sugar/graphics/window.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/Makefile.am
	source/external/source/sugar-toolkit/src/sugar/tutorius/actions.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/overlayer.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/services.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/coretests.py
	source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py

1 files changed, 35 insertions, 3 deletions

diff --git a/src/sugar/tutorius/tests/run-tests.py b/src/sugar/tutorius/tests/run-tests.py
index 74efd64..db10c54 100755
--- a/src/sugar/tutorius/tests/run-tests.py
+++ b/src/sugar/tutorius/tests/run-tests.py
@@ -2,11 +2,43 @@
 # This is a dumb script to run tests on the sugar-jhbuild installed files
 # The path added is the default path for the jhbuild build
 
+INSTALL_PATH="../../../../../../install/lib/python2.5/site-packages/"
+
 import os, sys
 sys.path.insert(0,
-    os.path.abspath("../../../../../../install/lib/python2.5/site-packages/")
+    os.path.abspath(INSTALL_PATH)
 )
+
+FULL_PATH = os.path.join(INSTALL_PATH,"sugar/tutorius")
+GLOB_PATH = os.path.join(FULL_PATH,"*.py")
 import unittest
-from coretests import *
+from glob import glob
+
+import sys
+if __name__=='__main__':
+    if "--coverage" in sys.argv:
+        sys.argv=[arg for arg in sys.argv if arg != "--coverage"]
+        import coverage
+        coverage.erase()
+        #coverage.exclude('raise NotImplementedError')
+        coverage.start()
+
+        import coretests
+        import servicestests
+
+        
+        suite = unittest.TestSuite()
+        suite.addTests(unittest.findTestCases(coretests))
+        suite.addTests(unittest.findTestCases(servicestests))
+        
+        runner = unittest.TextTestRunner()
+        runner.run(suite)
+
+        coverage.stop()
+        coverage.report(glob(GLOB_PATH))
+        coverage.erase()
+    else:
+        from coretests import *
+        from servicestests import *
 
-unittest.main()
+        unittest.main()