Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / third_party / trace-viewer / third_party / tvcm / tvcm / browser_controller.py

diff --git a/src/third_party/trace-viewer/third_party/tvcm/tvcm/browser_controller.py b/src/third_party/trace-viewer/third_party/tvcm/tvcm/browser_controller.py
index 77b01ee..23f4c4c 100644 (file)
--- a/src/third_party/trace-viewer/third_party/tvcm/tvcm/browser_controller.py
+++ b/src/third_party/trace-viewer/third_party/tvcm/tvcm/browser_controller.py
@@ -160,20 +160,29 @@ class BrowserController(object):
               window.__thennableResult = err;
               return;
             }
-            window.__thennableResult = e.message + '\\n' + e.stack;
+            if (err.stack)
+               window.__thennableResult = err.stack;
+            else
+               window.__thennableResult = err;
           });
     })();
 """ % js
-    self._tab.message_output_stream = sys.stderr
     self._tab.ExecuteJavaScript(full_js)
     self._tab.WaitForJavaScriptExpression('window.__thennableSucceeded !== undefined',
                                           timeout=timeout)
     val = self._tab.EvaluateJavaScript('window.__thennableSucceeded')
     if val == False:
-      raise Exception('Failed: %s' % self._tab.EvaluateJavaScript(
-          'window.__thennableResult'))
+      raise Exception(str(self._tab.EvaluateJavaScript(
+          'window.__thennableResult')))
     return self._tab.EvaluateJavaScript('window.__thennableResult')
 
+  @property
+  def stdout_enabled(self, enabled):
+    if enabled:
+      self._tab.message_output_stream = sys.stderr
+    else:
+      self._tab.message_output_stream = None
+
   def __enter__(self):
     return self