Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / core / backends / chrome / inspector_console_unittest.py

diff --git a/src/tools/telemetry/telemetry/core/backends/chrome/inspector_console_unittest.py b/src/tools/telemetry/telemetry/core/backends/chrome/inspector_console_unittest.py
index ef61cb5..8abe21f 100644 (file)
--- a/src/tools/telemetry/telemetry/core/backends/chrome/inspector_console_unittest.py
+++ b/src/tools/telemetry/telemetry/core/backends/chrome/inspector_console_unittest.py
@@ -1,24 +1,20 @@
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
 import re
 import StringIO
 
 from telemetry.core import util
-from telemetry.unittest import DisabledTestOnCrOS
 from telemetry.unittest import tab_test_case
 
+
 class TabConsoleTest(tab_test_case.TabTestCase):
-  @DisabledTestOnCrOS
   def testConsoleOutputStream(self):
-    self._browser.SetHTTPServerDirectories(util.GetUnittestDataDir())
-
     stream = StringIO.StringIO()
     self._tab.message_output_stream = stream
 
-    self._tab.Navigate(
-      self._browser.http_server.UrlOf('page_that_logs_to_console.html'))
-    self._tab.WaitForDocumentReadyStateToBeComplete()
+    self.Navigate('page_that_logs_to_console.html')
 
     initial = self._tab.EvaluateJavaScript('window.__logCount')
     def GotLog():
@@ -33,4 +29,3 @@ class TabConsoleTest(tab_test_case.TabTestCase):
       prefix = 'http://(.+)/page_that_logs_to_console.html:9'
       expected_line = 'At %s: Hello, world' % prefix
       self.assertTrue(re.match(expected_line, line))
-