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

Unified Diff: tools/telemetry/telemetry/core/extension_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/extension_unittest.py
diff --git a/tools/telemetry/telemetry/core/extension_unittest.py b/tools/telemetry/telemetry/core/extension_unittest.py
index eb3b5961722bf01730acf628fa9db358181f92db..986139eda01be0718cde1298c2e608f8e24b9eac 100644
--- a/tools/telemetry/telemetry/core/extension_unittest.py
+++ b/tools/telemetry/telemetry/core/extension_unittest.py
@@ -9,14 +9,13 @@ import unittest
from telemetry.core import browser_finder
from telemetry.core import extension_to_load
+from telemetry.core import util
from telemetry.core.chrome import extension_dict_backend
from telemetry.unittest import options_for_unittests
class ExtensionTest(unittest.TestCase):
def setUp(self):
- extension_path = os.path.join(os.path.dirname(__file__),
- '..', '..', 'unittest_data', 'simple_extension')
-
+ extension_path = os.path.join(util.GetUnittestDataDir(), 'simple_extension')
options = options_for_unittests.GetCopy()
load_extension = extension_to_load.ExtensionToLoad(
extension_path, options.browser_type)
@@ -60,8 +59,7 @@ class ExtensionTest(unittest.TestCase):
class NonExistentExtensionTest(unittest.TestCase):
def testNonExistentExtensionPath(self):
"""Test that a non-existent extension path will raise an exception."""
- extension_path = os.path.join(os.path.dirname(__file__),
- '..', '..', 'unittest_data', 'foo')
+ extension_path = os.path.join(util.GetUnittestDataDir(), 'foo')
options = options_for_unittests.GetCopy()
self.assertRaises(extension_to_load.ExtensionPathNonExistentException,
lambda: extension_to_load.ExtensionToLoad(
@@ -69,8 +67,7 @@ class NonExistentExtensionTest(unittest.TestCase):
def testExtensionNotLoaded(self):
"""Querying an extension that was not loaded will return None"""
- extension_path = os.path.join(os.path.dirname(__file__),
- '..', '..', 'unittest_data', 'simple_extension')
+ extension_path = os.path.join(util.GetUnittestDataDir(), 'simple_extension')
options = options_for_unittests.GetCopy()
load_extension = extension_to_load.ExtensionToLoad(
extension_path, options.browser_type)
@@ -87,8 +84,8 @@ class MultipleExtensionTest(unittest.TestCase):
number of temporary directories to load as extensions"""
self._extension_dirs = [tempfile.mkdtemp()
for i in range(3)] # pylint: disable=W0612
- src_extension_dir = os.path.abspath(os.path.join(os.path.dirname(__file__),
- '..', '..', 'unittest_data', 'simple_extension'))
+ src_extension_dir = os.path.join(
+ util.GetUnittestDataDir(), 'simple_extension')
manifest_path = os.path.join(src_extension_dir, 'manifest.json')
script_path = os.path.join(src_extension_dir, 'background.js')
for d in self._extension_dirs:
@@ -131,8 +128,8 @@ class MultipleExtensionTest(unittest.TestCase):
class ComponentExtensionTest(unittest.TestCase):
def testComponentExtensionBasic(self):
- extension_path = os.path.join(os.path.dirname(__file__),
- '..', '..', 'unittest_data', 'component_extension')
+ extension_path = os.path.join(
+ util.GetUnittestDataDir(), 'component_extension')
options = options_for_unittests.GetCopy()
load_extension = extension_to_load.ExtensionToLoad(
extension_path, options.browser_type, is_component=True)
@@ -152,8 +149,7 @@ class ComponentExtensionTest(unittest.TestCase):
def testComponentExtensionNoPublicKey(self):
# simple_extension does not have a public key.
- extension_path = os.path.join(os.path.dirname(__file__),
- '..', '..', 'unittest_data', 'simple_extension')
+ extension_path = os.path.join(util.GetUnittestDataDir(), 'simple_extension')
options = options_for_unittests.GetCopy()
self.assertRaises(extension_to_load.MissingPublicKeyException,
lambda: extension_to_load.ExtensionToLoad(

Powered by Google App Engine
This is Rietveld 408576698