[Pkg-mozext-commits] [requestpolicy] 98/257: [tst][imp] Marionette console error detection: record messages

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 8d88a6c50d7325f0ebe5395e3a6d3303e3dc4e25
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sat Oct 17 01:14:37 2015 +0200

    [tst][imp] Marionette console error detection: record messages
---
 tests/helper-addons/dev-helper/content/console-observer.jsm |  7 +++++++
 tests/marionette/rp_puppeteer/api/error_detection.py        | 13 +++++++++++++
 tests/marionette/rp_puppeteer/ui/addons.py                  | 13 +++++++++----
 tests/marionette/rp_ui_harness/testcases.py                 |  4 +++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/tests/helper-addons/dev-helper/content/console-observer.jsm b/tests/helper-addons/dev-helper/content/console-observer.jsm
index 3ddfb7b..9965683 100644
--- a/tests/helper-addons/dev-helper/content/console-observer.jsm
+++ b/tests/helper-addons/dev-helper/content/console-observer.jsm
@@ -51,13 +51,19 @@ function isRPException(aMessage) {
  */
 var ConsoleObserver = (function (self) {
   let numErrors = 0;
+  let messages = [];
 
   self.getNumErrors = function () {
     return numErrors;
   };
+  
+  self.getMessages = function () {
+    return messages;
+  };
 
   self.reset = function () {
     numErrors = 0;
+    messages = [];
   };
 
   self.startup = function () {
@@ -74,6 +80,7 @@ var ConsoleObserver = (function (self) {
 
     if (isRPException(msg)) {
       ++numErrors;
+      messages.push(msg);
       dump("[RequestPolicy] [Browser Console] " + msg + "\n");
     }
   };
diff --git a/tests/marionette/rp_puppeteer/api/error_detection.py b/tests/marionette/rp_puppeteer/api/error_detection.py
index a0fd56b..0d4597e 100644
--- a/tests/marionette/rp_puppeteer/api/error_detection.py
+++ b/tests/marionette/rp_puppeteer/api/error_detection.py
@@ -21,6 +21,10 @@ class ErrorDetection(BaseLib):
     def n_errors(self):
         raise NotImplementedError
 
+    @property
+    def messages(self):
+        raise NotImplementedError
+
     def reset(self):
         raise NotImplementedError
 
@@ -60,6 +64,15 @@ class ConsoleErrorDetection(ErrorDetection):
                 return scope.ConsoleObserver.getNumErrors();
                 """)
 
+    @property
+    def messages(self):
+        return self.marionette.execute_script("""
+          let scope = {};
+          Components.utils.import("chrome://rpc-dev-helper/" +
+              "content/console-observer.jsm", scope);
+          return scope.ConsoleObserver.getMessages();
+        """)
+
     def reset(self):
         with self.marionette.using_context("chrome"):
             return self.marionette.execute_script(
diff --git a/tests/marionette/rp_puppeteer/ui/addons.py b/tests/marionette/rp_puppeteer/ui/addons.py
index 4b9fd68..838493f 100644
--- a/tests/marionette/rp_puppeteer/ui/addons.py
+++ b/tests/marionette/rp_puppeteer/ui/addons.py
@@ -82,16 +82,21 @@ class RequestPolicy(BaseLib):
                                logging_errors_before)
         console_error_count = (self.console_error_detect.n_errors -
                                console_errors_before)
+        console_error_messages = self.console_error_detect.messages
+
         if logging_error_count > 0 and console_error_count > 0:
             raise Exception("There have been {} Logging errors and "
-                            "{} Console errors!".format(logging_error_count,
-                                                        console_error_count))
+                            "{} Console errors! "
+                            "Console error messages were: {}"
+                            .format(logging_error_count, console_error_count,
+                                    console_error_messages))
         elif logging_error_count > 0:
             raise Exception("There have been {} Logging "
                             "errors!".format(logging_error_count))
         elif console_error_count > 0:
-            raise Exception("There have been {} Console "
-                            "errors!".format(console_error_count))
+            raise Exception("There have been {} Console  errors! "
+                            "Messages were: {}".format(console_error_count,
+                                                       console_error_messages))
 
     @contextmanager
     def install_in_two_steps(self):
diff --git a/tests/marionette/rp_ui_harness/testcases.py b/tests/marionette/rp_ui_harness/testcases.py
index 0300b42..e650bb0 100644
--- a/tests/marionette/rp_ui_harness/testcases.py
+++ b/tests/marionette/rp_ui_harness/testcases.py
@@ -58,7 +58,9 @@ class RequestPolicyTestCase(RequestPolicyPuppeteer, FirefoxTestCase):
             self.assertEqual(self.logging_error_detect.n_errors, 0,
                              "There should be no logging errers.")
             self.assertEqual(self.console_error_detect.n_errors, 0,
-                             "There should be no console errors.")
+                             "There should be no console errors. "
+                             "Messages were: {}"
+                             .format(self.console_error_detect.messages))
         finally:
             self.logging_error_detect.reset()
             self.console_error_detect.reset()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git