Commit 3bc0b932 authored by Egor Pasko's avatar Egor Pasko Committed by Commit Bot

cygprofile: switch run_tests to vpython and revert psutil import workaround

This switches tools/cygprofile/run_tests to vpython, which should have
been done as part of http://crrev.com/546845.

After the vpython switch the workaround in http://crrev.com/546845
should not be necessary, so revert this commit as well:
> cygprofile: Fix unittests for cygprofile on CQ.
>
> orderfile_generator_backend_unittests imports
> orderfile_generator_backend, which transitively requires psutil, which
> is not available on the CQ bots.
>
> As psutil is not used in unit tests, handle the import error to
> allow unit tests to run on CQ, and CLs in //tools/cygprofile to pass
> presubmit checks.
>
> Change-Id: Id06bd2b7936509ef44a02d7b6497fa818d439291
> Reviewed-on: https://chromium-review.googlesource.com/985975
> Commit-Queue: Benoit L <lizeb@chromium.org>
> Reviewed-by: Egor Pasko <pasko@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#546790}

Bug: None
Change-Id: Ib0737acf652b283c212a61a2bae83a9c373c9fbf
Reviewed-on: https://chromium-review.googlesource.com/988072Reviewed-by: default avatarBenoit L <lizeb@chromium.org>
Commit-Queue: Egor Pasko <pasko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547659}
parent 63bccd77
...@@ -29,14 +29,7 @@ import time ...@@ -29,14 +29,7 @@ import time
import cygprofile_utils import cygprofile_utils
import patch_orderfile import patch_orderfile
import process_profiles import process_profiles
import profile_android_startup
try:
import profile_android_startup
except ImportError as e:
logging.error(
'Import error, if this happens outside unittests, this module will '
'not work correctly. Error: %s', e)
import symbol_extractor import symbol_extractor
......
#!/usr/bin/env python #!/usr/bin/env vpython
# Copyright 2014 The Chromium Authors. All rights reserved. # Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment