[FIX] gamification: correct name of ir.rule fixing bad copy-paste

[odoo/odoo.git] / openerpcommand / run_tests.py

diff --git a/openerpcommand/run_tests.py b/openerpcommand/run_tests.py
index dda0f59..7e23f3e 100644 (file)
--- a/openerpcommand/run_tests.py
+++ b/openerpcommand/run_tests.py
@@ -63,8 +63,8 @@ def get_test_modules(module, submodule, explode):
         ms = submodules
     elif submodule == '__fast_suite__':
         # `suite` was used before the 6.1 release instead of `fast_suite`.
-        ms = fast_suite if fast_suite else getattr(m, 'suite', None)
-        if ms is None:
+        ms = fast_suite if hasattr(m, 'fast_suite') else getattr(m, 'suite', None)
+        if not ms:
             if explode:
                 print 'The module `%s` has no defined test suite.' % (module,)
                 show_submodules_and_exit()
@@ -72,7 +72,7 @@ def get_test_modules(module, submodule, explode):
                 ms = []
     elif submodule == '__sanity_checks__':
         ms = checks
-        if ms is None:
+        if not ms:
             if explode:
                 print 'The module `%s` has no defined sanity checks.' % (module,)
                 show_submodules_and_exit()
@@ -101,17 +101,21 @@ def run(args):
     import openerp
 
     config = openerp.tools.config
+    config.load()
+
     config['db_name'] = args.database
     if args.port:
         config['xmlrpc_port'] = int(args.port)
-    config['admin_passwd'] = 'admin'
-    config['db_password'] = 'a2aevl8w' # TODO from .openerpserverrc
-    config['addons_path'] = args.addons.replace(':',',')
+
     if args.addons:
-        args.addons = args.addons.split(':')
+        args.addons = args.addons.replace(':',',').split(',')
     else:
         args.addons = []
 
+    # ensure no duplication in addons paths
+    args.addons = list(set(args.addons))
+    config['addons_path'] = ','.join(args.addons)
+
     import logging
     openerp.netsvc.init_alternative_logger()
     logging.getLogger('openerp').setLevel(logging.CRITICAL)
@@ -133,7 +137,12 @@ def run(args):
     else:
         test_modules = get_test_modules(module, submodule, explode=True)
 
-    # Run the test suite.
+    print 'Test modules:'
+    for test_module in test_modules:
+        print '    ', test_module.__name__
+    print
+    sys.stdout.flush()
+
     if not args.dry_run:
         suite = unittest2.TestSuite()
         for test_module in test_modules:
@@ -141,10 +150,6 @@ def run(args):
         r = unittest2.TextTestRunner(verbosity=2).run(suite)
         if r.errors or r.failures:
             sys.exit(1)
-    else:
-        print 'Test modules:'
-        for test_module in test_modules:
-            print ' ', test_module.__name__
 
 def add_parser(subparsers):
     parser = subparsers.add_parser('run-tests',