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

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

Issue 22989006: [telemetry] Change many relative paths to use util.Get*Dir(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 4 months 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
Index: tools/telemetry/telemetry/core/temporary_http_server_unittest.py
diff --git a/tools/telemetry/telemetry/core/temporary_http_server_unittest.py b/tools/telemetry/telemetry/core/temporary_http_server_unittest.py
index 984eb213329fa2fdced32bb1e73876a6fbed45ec..64ad67ec24edfcd7dcc5b83bf2b71f30b846040e 100644
--- a/tools/telemetry/telemetry/core/temporary_http_server_unittest.py
+++ b/tools/telemetry/telemetry/core/temporary_http_server_unittest.py
@@ -1,21 +1,20 @@
# Copyright (c) 2012 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 os
+
import unittest
from telemetry.core import browser_finder
+from telemetry.core import util
from telemetry.unittest import options_for_unittests
class TemporaryHTTPServerTest(unittest.TestCase):
def testBasicHosting(self):
- unittest_data_dir = os.path.join(os.path.dirname(__file__),
- '..', '..', 'unittest_data')
options = options_for_unittests.GetCopy()
browser_to_create = browser_finder.FindBrowser(options)
with browser_to_create.Create() as b:
b.Start()
- b.SetHTTPServerDirectories(unittest_data_dir)
+ b.SetHTTPServerDirectories(util.GetUnittestDataDir())
t = b.tabs[0]
t.Navigate(b.http_server.UrlOf('/blank.html'))
t.WaitForDocumentReadyStateToBeComplete()
« no previous file with comments | « tools/telemetry/telemetry/core/tab_unittest.py ('k') | tools/telemetry/telemetry/page/actions/all_page_actions.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698