diff options
author | mike <michael.jmontcalm@gmail.com> | 2009-04-15 02:55:10 (GMT) |
---|---|---|
committer | mike <michael.jmontcalm@gmail.com> | 2009-04-15 02:55:10 (GMT) |
commit | 8ab1e32a479c018766f330ecf71670ef71492300 (patch) | |
tree | 529350bcb00d23c8c404510c594e4a6c5ffa6394 /src/sugar/tutorius/tests/run-tests.py | |
parent | 29177ac24ce70208a6225669a1275f67ac0f647a (diff) | |
parent | 0aae7813af4bb9ccdc4f02ba7cd483c8967078f1 (diff) |
Merge commit 'origin/lp349874'
Conflicts:
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/actiontests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/filterstests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/gtkutilstests.py
source/external/source/sugar-toolkit/src/sugar/tutorius/tests/run-tests.py
Diffstat (limited to 'src/sugar/tutorius/tests/run-tests.py')
-rwxr-xr-x | src/sugar/tutorius/tests/run-tests.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sugar/tutorius/tests/run-tests.py b/src/sugar/tutorius/tests/run-tests.py index 1cda76e..63a8de1 100755 --- a/src/sugar/tutorius/tests/run-tests.py +++ b/src/sugar/tutorius/tests/run-tests.py @@ -10,7 +10,7 @@ sys.path.insert(0, ) FULL_PATH = os.path.join(INSTALL_PATH,"sugar/tutorius") -SUBDIRS = [] +SUBDIRS = ["uam"] GLOB_PATH = os.path.join(FULL_PATH,"*.py") import unittest from glob import glob @@ -36,6 +36,7 @@ if __name__=='__main__': import overlaytests import linear_creatortests import actiontests + import uamtests import filterstests import constraintstests import propertiestests @@ -47,6 +48,7 @@ if __name__=='__main__': 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)) @@ -65,6 +67,7 @@ if __name__=='__main__': from overlaytests import * from actiontests import * from linear_creatortests import * + from uamtests import * from filterstests import * unittest.main() |