From 55410ee72a22b5bd2fb38daa0d85bbcb4574ec80 Mon Sep 17 00:00:00 2001 From: Andreas Tolfsen Date: Wed, 3 Feb 2016 18:44:55 +0000 Subject: [PATCH] Bug 1245153 - Wrap errors before they are passed through the IPC channel; r=automatedtester error.wrap acts as a no-op if it is passed a prototype which is already of the WebDriverError prototypal chain. MozReview-Commit-ID: Gd9kUEvsgNv --HG-- extra : commitid : HObqpKV7a9s extra : rebase_source : c96b3c1a00a68a56d69d253945de5607039e3b49 extra : source : d75ad1397656e43d22d0d69211df9fce3a667f0d extra : histedit_source : a6e620e3e4b6bfa4e1d77df48eaab59ffbc3cdce --- testing/marionette/proxy.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/marionette/proxy.js b/testing/marionette/proxy.js index 1a294394f1f2..0be8b35e9d70 100644 --- a/testing/marionette/proxy.js +++ b/testing/marionette/proxy.js @@ -171,7 +171,8 @@ proxy.AsyncMessageChannel = class { if (typeof obj == "undefined") { this.sendReply_(uuid, proxy.AsyncMessageChannel.ReplyType.Ok); } else if (error.isError(obj)) { - let serr = error.toJson(obj); + let err = error.wrap(obj); + let serr = error.toJson(err); this.sendReply_(uuid, proxy.AsyncMessageChannel.ReplyType.Error, serr); } else { this.sendReply_(uuid, proxy.AsyncMessageChannel.ReplyType.Value, obj);