Merge lp:~openerp-dev/openobject-server/trunk-r9215-fix-chm into lp:openobject-server

[Christophe Simonis (OpenERP)]

=== modified file 'openerp/http.py'
--- openerp/http.py	2014-03-24 16:12:57 +0000
+++ openerp/http.py	2014-03-25 13:51:01 +0000
@@ -287,7 +287,7 @@
         def checked_call(___dbname, *a, **kw):
             # The decorator can call us more than once if there is an database error. In this
             # case, the request cursor is unusable. Rollback transaction to create a new one.
-            if self._cr:
+            if self._cr and not openerp.tools.config['test_enable']:
                 self._cr.rollback()
             return self.endpoint(*a, **kw)
 

=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py	2014-03-17 15:18:10 +0000
+++ openerp/modules/loading.py	2014-03-25 13:51:01 +0000
@@ -42,6 +42,7 @@
 from openerp.tools.translate import _
 from openerp.modules.module import initialize_sys_path, \
     load_openerp_module, init_module_models, adapt_version
+from module import runs_post_install
 
 _logger = logging.getLogger(__name__)
 _test_logger = logging.getLogger('openerp.tests')
@@ -425,8 +426,13 @@
         for model in registry.models.values():
             model._register_hook(cr)
 
+        # STEP 9: Run the post-install tests
+        cr.commit()
+        if openerp.tools.config['test_enable']:
+            cr.execute("SELECT name FROM ir_module_module WHERE state='installed'")
+            for module_name in cr.fetchall():
+                report.record_result(openerp.modules.module.run_unit_tests(module_name[0], cr.dbname, position=runs_post_install))
     finally:
         cr.close()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'openerp/modules/module.py'
--- openerp/modules/module.py	2014-03-17 02:13:17 +0000
+++ openerp/modules/module.py	2014-03-25 13:51:01 +0000
@@ -356,7 +356,23 @@
 
 current_test = None
 
-def run_unit_tests(module_name, dbname):
+def runs_at(test, hook, default):
+    # by default, tests do not run post install
+    test_runs = getattr(test, hook, default)
+
+    # for a test suite, we're done
+    if not isinstance(test, unittest.TestCase):
+        return test_runs
+
+    # otherwise check the current test method to see it's been set to a
+    # different state
+    method = getattr(test, test._testMethodName)
+    return getattr(method, hook, test_runs)
+
+runs_at_install = functools.partial(runs_at, hook='at_install', default=True)
+runs_post_install = functools.partial(runs_at, hook='post_install', default=False)
+
+def run_unit_tests(module_name, dbname, position=runs_at_install):
     """
     :returns: ``True`` if all of ``module_name``'s tests succeeded, ``False``
               if any of them failed.
@@ -368,7 +384,7 @@
     r = True
     for m in mods:
         tests = unwrap_suite(unittest2.TestLoader().loadTestsFromModule(m))
-        suite = unittest2.TestSuite(itertools.ifilter(runs_at_install, tests))
+        suite = unittest2.TestSuite(itertools.ifilter(position, tests))
         _logger.info('running %s tests.', m.__name__)
 
         result = unittest2.TextTestRunner(verbosity=2, stream=TestStream(m.__name__)).run(suite)
@@ -380,22 +396,6 @@
     current_test = None
     return r
 
-def runs_at(test, hook, default):
-    # by default, tests do not run post install
-    test_runs = getattr(test, hook, default)
-
-    # for a test suite, we're done
-    if not isinstance(test, unittest.TestCase):
-        return test_runs
-
-    # otherwise check the current test method to see it's been set to a
-    # different state
-    method = getattr(test, test._testMethodName)
-    return getattr(method, hook, test_runs)
-
-runs_at_install = functools.partial(runs_at, hook='at_install', default=True)
-runs_post_install = functools.partial(runs_at, hook='post_install', default=False)
-
 def unwrap_suite(test):
     """
     Attempts to unpack testsuites (holding suites or cases) in order to

=== modified file 'openerp/tests/phantomtest.js'
--- openerp/tests/phantomtest.js	2014-03-16 16:06:34 +0000
+++ openerp/tests/phantomtest.js	2014-03-25 13:51:01 +0000
@@ -6,7 +6,8 @@
 
     (function waitLoop() {
         if(new Date - start > timeout) {
-            error(timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms");
+            console.log('error', timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms");
+            phantom.exit(1);
         } else if (ready()) {
             callback();
         } else {
@@ -15,10 +16,6 @@
     }());
 }
 
-function error(message) {
-    console.log('error', message);
-    phantom.exit(1);
-}
 function PhantomTest() {
     var self = this;
     this.options = JSON.parse(phantom.args[phantom.args.length-1]);
@@ -49,10 +46,12 @@
             }));
             msg.push('(leaf frame on top)')
         }
-        error(JSON.stringify(msg.join('\n')));
+        console.log('error', JSON.stringify(msg.join('\n')));
+        phantom.exit(1);
     };
     this.page.onAlert = function(message) {
-        error(message);
+        console.log('error', message);
+        phantom.exit(1);
     };
     this.page.onConsoleMessage = function(message) {
         console.log(message);
@@ -78,7 +77,8 @@
                 if(!found) {
                     console.log('Injecting', src, 'needed for', need);
                     if(!self.page.injectJs(src)) {
-                        error("Cannot inject " + src);
+                        console.log('error', "Cannot inject " + src);
+                        phantom.exit(1);
                     }
                 }
             }
@@ -88,8 +88,9 @@
         self.page.evaluate(function () {
             var message = ("Timeout\nhref: " + window.location.href
                 + "\nreferrer: " + document.referrer
-                + "\n\n" + document.body.innerHTML).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
-            error(message);
+                + "\n\n" + (document.body && document.body.innerHTML)).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
+            console.log('error', message);
+            phantom.exit(1);
         });
     }, self.timeout);
 
@@ -108,7 +109,8 @@
         var url = self.origin + url_path;
         self.page.open(url, function(status) {
             if (status !== 'success') {
-                error("failed to load " + url)
+                console.log('error', "failed to load " + url);
+                phantom.exit(1);
             } else {
                 console.log('loaded', url, status);
                 // process ready
@@ -119,7 +121,7 @@
                         try {
                             console.log("page.evaluate eval expr:", ready);
                             r = !!eval(ready);
-                        } catch(ex) { 
+                        } catch(ex) {
                         }
                         console.log("page.evaluate eval result:", r);
                         return r;