diff -r 87cfa131b535 -r e7e0ae78773e configurationengine/source/cone/runtests.py --- a/configurationengine/source/cone/runtests.py Fri Mar 12 08:30:17 2010 +0200 +++ b/configurationengine/source/cone/runtests.py Tue Aug 10 14:29:28 2010 +0300 @@ -15,28 +15,6 @@ # -import os,sys,unittest -from optparse import OptionParser, OptionGroup - -ROOT_PATH = os.path.dirname(os.path.abspath(__file__)) -sys.path.insert(0, os.path.join(ROOT_PATH,'..')) -#sys.path.insert(0, os.path.join(ROOT_PATH,'../testautomation')) - -import cone.storage.tests -import cone.core.tests -import cone.confml.tests -import cone.carbon.tests -import cone.public.tests -#from testautomation import testcli - -def collect_suite(): - suite = unittest.TestSuite() - suite.addTests(cone.storage.tests.collect_suite()) - suite.addTests(cone.core.tests.collect_suite()) - suite.addTests(cone.confml.tests.collect_suite()) - suite.addTests(cone.carbon.tests.collect_suite()) - suite.addTests(cone.public.tests.collect_suite()) - return suite if __name__ == '__main__': import nose @@ -49,9 +27,5 @@ conf = nose.config.Config(files=allfiles, plugins=plugins) conf.configure(argv=['collector']) - print "conf :", conf.include nose.main(config=conf) -#if __name__ == '__main__': -# testcli.run(collect_suite()) -