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

Unified Diff: tools/telemetry/telemetry/core/platform/profiler/monsoon_profiler.py

Issue 75803002: [telemetry] Add Monsoon protocol library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move import so that we don't attempt to do it if we're not going to use it. Created 7 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
Index: tools/telemetry/telemetry/core/platform/profiler/monsoon_profiler.py
diff --git a/tools/telemetry/telemetry/core/platform/profiler/monsoon_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/monsoon_profiler.py
index 7161db13ac7469de5cd89a698a7ad35eda6b39cf..e43555d7ef61a1310269dcc22c6d917903ec7ef8 100644
--- a/tools/telemetry/telemetry/core/platform/profiler/monsoon_profiler.py
+++ b/tools/telemetry/telemetry/core/platform/profiler/monsoon_profiler.py
@@ -4,18 +4,10 @@
import csv
import multiprocessing
-import os
-import sys
from telemetry.core import exceptions
-from telemetry.core import util
from telemetry.core.platform import profiler
-
-sys.path.append(os.path.join(util.GetTelemetryDir(), 'third_party', 'internal'))
-try:
- import monsoon # pylint: disable=F0401
-except ImportError:
- monsoon = None
+from telemetry.core.platform.profiler import monsoon
def _CollectData(output_path, is_collecting):
@@ -80,11 +72,9 @@ class MonsoonProfiler(profiler.Profiler):
@classmethod
def is_supported(cls, browser_type):
- if not monsoon:
- return False
try:
monsoon.Monsoon(wait=False)
- except IOError:
+ except EnvironmentError:
return False
else:
return True
« no previous file with comments | « tools/telemetry/telemetry/core/platform/profiler/monsoon.py ('k') | tools/telemetry/third_party/pyserial/LICENSE.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698