Split long unit tests into different sets by their dependencies.
Add database.db_utils_unittest to long tests; requires MySQLdb.
Add rpc_utils_unittest.py to long tests: requires Django.
Signed-off-by: James Ren <jamesren@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@4271 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/utils/unittest_suite.py b/utils/unittest_suite.py
index 205f497..c5c5fd2 100755
--- a/utils/unittest_suite.py
+++ b/utils/unittest_suite.py
@@ -17,25 +17,45 @@
help="A space separated list of tests to skip")
-LONG_TESTS = set((
- 'monitor_db_unittest.py',
- 'monitor_db_functional_test.py',
- 'monitor_db_cleanup_test.py',
+REQUIRES_DJANGO = set((
+ 'monitor_db_unittest.py',
+ 'monitor_db_functional_test.py',
+ 'monitor_db_cleanup_test.py',
+ 'frontend_unittest.py',
+ 'csv_encoder_unittest.py',
+ 'rpc_interface_unittest.py',
+ 'models_test.py',
+ 'scheduler_models_unittest.py',
+ 'metahost_scheduler_unittest.py',
+ 'site_metahost_scheduler_unittest.py',
+ 'rpc_utils_unittest.py',
+ ))
+
+REQUIRES_MYSQLDB = set((
+ 'migrate_unittest.py',
+ 'db_utils_unittest.py',
+ ))
+
+REQUIRES_GWT = set((
+ 'client_compilation_unittest',
+ ))
+
+REQUIRES_SIMPLEJSON = set((
+ 'resources_test.py',
+ 'serviceHandler_unittest.py',
+ ))
+
+LONG_RUNTIME = set((
'barrier_unittest.py',
- 'migrate_unittest.py',
- 'frontend_unittest.py',
- 'client_compilation_unittest.py',
- 'csv_encoder_unittest.py',
- 'rpc_interface_unittest.py',
- 'resources_test.py',
'logging_manager_test.py',
- 'models_test.py',
- 'serviceHandler_unittest.py',
- 'scheduler_models_unittest.py',
- 'metahost_scheduler_unittest.py',
- 'site_metahost_scheduler_unittest.py',
))
+LONG_TESTS = (REQUIRES_DJANGO |
+ REQUIRES_MYSQLDB |
+ REQUIRES_GWT |
+ REQUIRES_SIMPLEJSON |
+ LONG_RUNTIME)
+
ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))