diff -r 87cfa131b535 -r e7e0ae78773e configurationengine/source/plugins/symbian/ConeCRMLPlugin/CRMLPlugin/tests/__init__.py --- a/configurationengine/source/plugins/symbian/ConeCRMLPlugin/CRMLPlugin/tests/__init__.py Fri Mar 12 08:30:17 2010 +0200 +++ b/configurationengine/source/plugins/symbian/ConeCRMLPlugin/CRMLPlugin/tests/__init__.py Tue Aug 10 14:29:28 2010 +0300 @@ -13,28 +13,11 @@ # # Description: # + import sys, os, unittest # Path to the directory where this file is located ROOT_PATH = os.path.dirname(os.path.abspath(__file__)) -# Import common plug-in initialization -PLUGINS_ROOT = os.path.normpath(os.path.join(ROOT_PATH, '../../../..')) -assert os.path.split(PLUGINS_ROOT)[1] == 'plugins' -if PLUGINS_ROOT not in sys.path: sys.path.append(PLUGINS_ROOT) -import plugin_utils - +from testautomation import plugin_utils plugin_utils.plugin_test_init(ROOT_PATH) - -SCRIPTS_ROOT = os.path.normpath(os.path.join(ROOT_PATH, '../../../../..', "scripts")) -assert os.path.exists(SCRIPTS_ROOT) -os.environ['PYTHONPATH'] = os.environ.get('PYTHONPATH', '') + ';' + SCRIPTS_ROOT + ';' + PLUGINS_ROOT - -def collect_suite(): - return plugin_utils.collect_test_suite_from_dir(ROOT_PATH) - -def runtests(): - unittest.TextTestRunner(verbosity=2).run(collect_suite()) - -if __name__ == '__main__': - runtests()