Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: tools/telemetry/telemetry/core/local_server_unittest.py

Issue 1544263002: Revert of Disable local_server_unittest on win only (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/local_server_unittest.py
diff --git a/tools/telemetry/telemetry/core/local_server_unittest.py b/tools/telemetry/telemetry/core/local_server_unittest.py
index b69255e9c94d2bd77976e2cd3fdb3a570db363b7..8d9368532531298941e0afdb43a7c8959e1e2656 100644
--- a/tools/telemetry/telemetry/core/local_server_unittest.py
+++ b/tools/telemetry/telemetry/core/local_server_unittest.py
@@ -1,12 +1,12 @@
# Copyright 2014 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 unittest
import BaseHTTPServer
import SimpleHTTPServer
from telemetry.core import local_server
-from telemetry import decorators
from telemetry.testing import tab_test_case
@@ -61,7 +61,7 @@
cls._server = SimpleLocalServer()
cls._platform.StartLocalServer(cls._server)
- @decorators.Disabled('win') # flakily times out: https://crbug.com/570955
+ @unittest.skip("flakily times out: https://crbug.com/570955")
def testLocalServer(self):
self.assertTrue(self._server in self._platform.local_servers)
self._tab.Navigate(self._server.url)
@@ -70,7 +70,7 @@
body_text = body_text.strip()
self.assertEquals('hello world', body_text)
- @decorators.Disabled('win') # flakily times out: https://crbug.com/570955
+ @unittest.skip("flakily times out: https://crbug.com/570955")
def testStartingAndRestarting(self):
server2 = SimpleLocalServer()
self.assertRaises(Exception,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698