tools/telemetry/telemetry/core/chrome/form_based_credentials_backend_unittest_base.py - Issue 22989006: [telemetry] Change many relative paths to use util.Get*Dir().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/chrome/form_based_credentials_backend_unittest_base.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

« no previous file with comments | « tools/telemetry/telemetry/core/chrome/android_browser_finder.py ('k') | tools/telemetry/telemetry/core/chrome/inspector_console_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/chrome/form_based_credentials_backend_unittest_base.py

diff --git a/tools/telemetry/telemetry/core/chrome/form_based_credentials_backend_unittest_base.py b/tools/telemetry/telemetry/core/chrome/form_based_credentials_backend_unittest_base.py

index 6c6449f24e914bef77b59e4924cac7a0929ecd9d..2577b935d80f409c60d1ba25987a279b40c83603 100644

--- a/tools/telemetry/telemetry/core/chrome/form_based_credentials_backend_unittest_base.py

+++ b/tools/telemetry/telemetry/core/chrome/form_based_credentials_backend_unittest_base.py

@@ -6,6 +6,7 @@ import os

import unittest

from telemetry.core import browser_finder

+from telemetry.core import util

from telemetry.unittest import simple_mock

from telemetry.unittest import options_for_unittests

from telemetry.unittest import DisabledTest

@@ -15,9 +16,8 @@ _ = simple_mock.DONT_CARE

def _GetCredentialsPath():

# TODO: This shouldn't depend on tools/perf.

- credentials_path = os.path.join(

- os.path.dirname(__file__),

- '..', '..', '..', '..', 'perf', 'data', 'credentials.json')

+ credentials_path = os.path.join(util.GetChromiumSrcDir(),

+ 'tools', 'perf', 'data', 'credentials.json')

if not os.path.exists(credentials_path):

return None

return credentials_path