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

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

Issue 1491373003: Use catapult gsutil instead of telemetry gsutilz. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dave nit 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 | « tools/telemetry/catapult_base/cloud_storage.py ('k') | tools/telemetry/telemetry/internal/util/path.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/util.py
diff --git a/tools/telemetry/telemetry/core/util.py b/tools/telemetry/telemetry/core/util.py
index 8d8f705c110c4a3f23495429bee65cc34e7bfd0a..26bdd4861e3407e74d399d9a0de92f1c4c1b98c7 100644
--- a/tools/telemetry/telemetry/core/util.py
+++ b/tools/telemetry/telemetry/core/util.py
@@ -23,12 +23,11 @@ def GetBaseDir():
def GetTelemetryDir():
return os.path.normpath(os.path.join(
- __file__, '..', '..', '..'))
+ os.path.abspath(__file__), '..', '..', '..'))
def GetTelemetryThirdPartyDir():
- return os.path.normpath(os.path.join(
- __file__, '..', '..', '..', 'third_party'))
+ return os.path.join(GetTelemetryDir(), 'third_party')
def GetUnittestDataDir():
@@ -40,6 +39,12 @@ def GetChromiumSrcDir():
return os.path.normpath(os.path.join(GetTelemetryDir(), '..', '..'))
+# TODO(aiolos): Move this over to the path in catapult after the migration.
+def GetCatapultDir():
+ return os.path.normpath(os.path.join(
+ GetTelemetryDir(), '..', '..', 'third_party', 'catapult'))
+
+
_counter = [0]
def _GetUniqueModuleName():
_counter[0] += 1
« no previous file with comments | « tools/telemetry/catapult_base/cloud_storage.py ('k') | tools/telemetry/telemetry/internal/util/path.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698