|
|
Created:
5 years, 4 months ago by aiolos (Not reviewing) Modified:
5 years, 4 months ago CC:
chromium-reviews, telemetry-reviews_chromium.org Base URL:
https://chromium.googlesource.com/chromium/src.git@master Target Ref:
refs/pending/heads/master Project:
chromium Visibility:
Public. |
DescriptionAdd dependency_manager initialization to binary_manager
BUG=510231
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:win_perf_bisect;tryserver.chromium.perf:android_nexus5_perf_bisect
Committed: https://crrev.com/f592ba18312f43fe4186cc526db00960a1db0b48
Cr-Commit-Position: refs/heads/master@{#343320}
Committed: https://crrev.com/780b193b7e92cef04c6c1063068e6f5edbf8e3f2
Cr-Commit-Position: refs/heads/master@{#343547}
Patch Set 1 #
Total comments: 10
Patch Set 2 : comments #Patch Set 3 : rebase #Patch Set 4 : Fix failing tests. #Patch Set 5 : Fix failing tests. Move InitBinaryManagerForUnittests to telemetry.testing #Patch Set 6 : Fix all run_tests, not just the one in perf. #Patch Set 7 : Rethink testing setup. #Patch Set 8 : Change ProjectConfig usage. #
Total comments: 1
Patch Set 9 : Fix run_tests on win #
Total comments: 4
Patch Set 10 : Nits #Patch Set 11 : Fix and refactor the unittest. #
Messages
Total messages: 57 (25 generated)
aiolos@chromium.org changed reviewers: + eakuefner@chromium.org, nednguyen@google.com, sullivan@chromium.org
Please ignore the dependency_manager file. It will get rebased out of this cl once https://codereview.chromium.org/1273223002/ lands. (Which is currently blocked on CQ issues.)
lgtm
https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... File tools/telemetry/telemetry/internal/util/binary_manager.py (right): https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... tools/telemetry/telemetry/internal/util/binary_manager.py:21: util.GetTelemetryDir(), 'telemetry', 'internal', 'binary_dependencies.json') Did you already add this file? https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... tools/telemetry/telemetry/internal/util/binary_manager.py:38: logging.debug('Initialized the dependency manager.') This log should come before the dependency_manager.DependencyManager in case of failure? Also maybe add the content of config_files in the debug message?
lgtm https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/b... File tools/telemetry/telemetry/benchmark_runner.py (right): https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/b... tools/telemetry/telemetry/benchmark_runner.py:80: TODO(aiolos): Add link to description/example of a ProjectDependency file. Can you move the todo out of the docstring itself? https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... File tools/telemetry/telemetry/internal/util/binary_manager.py (right): https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... tools/telemetry/telemetry/internal/util/binary_manager.py:29: def InitDependencyManager(environment_config): nit: two newlines between top-level definitions.
https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... File tools/telemetry/telemetry/internal/util/binary_manager_unittest.py (right): https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... tools/telemetry/telemetry/internal/util/binary_manager_unittest.py:7: util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') Note: as crrev.com/1276173004 has landed, this is no longer necessary! You can write instead: from telemetry.third_party import mock
https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/b... File tools/telemetry/telemetry/benchmark_runner.py (right): https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/b... tools/telemetry/telemetry/benchmark_runner.py:80: TODO(aiolos): Add link to description/example of a ProjectDependency file. On 2015/08/10 17:07:03, eakuefner wrote: > Can you move the todo out of the docstring itself? Done. https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... File tools/telemetry/telemetry/internal/util/binary_manager.py (right): https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... tools/telemetry/telemetry/internal/util/binary_manager.py:21: util.GetTelemetryDir(), 'telemetry', 'internal', 'binary_dependencies.json') On 2015/08/10 17:01:10, nednguyen wrote: > Did you already add this file? Not yet. We don't actually do anything with the file yet, so I was going to add it in the CL that included the dependency_manager's actual initialization code. But thought knowing how it was getting passed in was useful for this CL. I can easily add an empty json file if you'd prefer. https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... tools/telemetry/telemetry/internal/util/binary_manager.py:29: def InitDependencyManager(environment_config): On 2015/08/10 17:07:03, eakuefner wrote: > nit: two newlines between top-level definitions. Done. https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... tools/telemetry/telemetry/internal/util/binary_manager.py:38: logging.debug('Initialized the dependency manager.') On 2015/08/10 17:01:10, nednguyen wrote: > This log should come before the dependency_manager.DependencyManager in case of > failure? That's actually why I wanted it after. I've cared less about whether we tried to initialize it and more that we succeeded in my debugging thus far, although that may not always be the case. I'm going to add a log before hand instead of moving it. > Also maybe add the content of config_files in the debug message? Done. https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... File tools/telemetry/telemetry/internal/util/binary_manager_unittest.py (right): https://codereview.chromium.org/1280903003/diff/1/tools/telemetry/telemetry/i... tools/telemetry/telemetry/internal/util/binary_manager_unittest.py:7: util.AddDirToPythonPath(util.GetTelemetryDir(), 'third_party', 'mock') On 2015/08/10 19:57:23, eakuefner wrote: > Note: as crrev.com/1276173004 has landed, this is no longer necessary! > > You can write instead: > from telemetry.third_party import mock Done.
The CQ bit was checked by aiolos@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from eakuefner@chromium.org, nednguyen@google.com Link to the patchset: https://codereview.chromium.org/1280903003/#ps40001 (title: "rebase")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1280903003/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1280903003/40001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)
Patchset #5 (id:80001) has been deleted
The CQ bit was checked by aiolos@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from eakuefner@chromium.org, nednguyen@google.com Link to the patchset: https://codereview.chromium.org/1280903003/#ps100001 (title: "Fix failing tests. Move InitBinaryManagerForUnittests to telemetry.testing")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1280903003/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1280903003/100001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: mac_perf_bisect on tryserver.chromium.perf (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.perf/builders/mac_perf_bisect/...)
Patchset #8 (id:160001) has been deleted
aiolos@chromium.org changed reviewers: + dtu@chromium.org
The CQ bit was checked by aiolos@chromium.org to run a CQ dry run
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1280903003/120002 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1280903003/120002
The CQ bit was unchecked by commit-bot@chromium.org
Dry run: Try jobs failed on following builders: mac_perf_bisect on tryserver.chromium.perf (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.perf/builders/mac_perf_bisect/...)
Patchset #8 (id:120002) has been deleted
nednguyen@google.com changed reviewers: + dpranke@google.com
+Dirk: Kari is having trouble landing this patch due to the way typ's parallelization works on windows. Can you help?
dpranke@chromium.org changed reviewers: + dpranke@chromium.org
https://codereview.chromium.org/1280903003/diff/100002/tools/telemetry/teleme... File tools/telemetry/telemetry/testing/run_tests.py (right): https://codereview.chromium.org/1280903003/diff/100002/tools/telemetry/teleme... tools/telemetry/telemetry/testing/run_tests.py:66: binary_manager.InitDependencyManager(args.client_config) You should try to avoid setting global variables as they don't really work in Python on windows in a multiprocessing context (there's no fork, so the state isn't copied over). If you really need a global, and need this routine to be called in every process, then make sure it is called via _SetUpProcess(), below.
On 2015/08/13 20:18:44, nednguyen wrote: > +Dirk: Kari is having trouble landing this patch due to the way typ's > parallelization works on windows. Can you help? I *could* go through and initialize things in the unittests/the testing helper functions to unblock this CL, but that won't work long term. (With the assumption that we want the client config to work for run_tests as well as for the benchmarks.)
Patchset #9 (id:190001) has been deleted
lgtm with nits https://codereview.chromium.org/1280903003/diff/210001/tools/telemetry/teleme... File tools/telemetry/telemetry/testing/run_tests.py (right): https://codereview.chromium.org/1280903003/diff/210001/tools/telemetry/teleme... tools/telemetry/telemetry/testing/run_tests.py:66: binary_manager.InitDependencyManager(args.client_config) I think it's better to put this in the Run(self, args) method below. Putting this in ProcessCommandLineArgs seems a bit off.. https://codereview.chromium.org/1280903003/diff/210001/tools/telemetry/teleme... tools/telemetry/telemetry/testing/run_tests.py:174: def _SetUpProcess(child, context): # pylint: disable=W0613 Nit: add comment explaining why we need to init the dependency manager again here.
https://codereview.chromium.org/1280903003/diff/210001/tools/telemetry/teleme... File tools/telemetry/telemetry/testing/run_tests.py (right): https://codereview.chromium.org/1280903003/diff/210001/tools/telemetry/teleme... tools/telemetry/telemetry/testing/run_tests.py:66: binary_manager.InitDependencyManager(args.client_config) On 2015/08/13 22:20:45, nednguyen wrote: > I think it's better to put this in the Run(self, args) method below. Putting > this in ProcessCommandLineArgs seems a bit off.. We can only do this if we move the check for possible browser to Run as well. The call to browser_finder.FindBrowser will raise an exception if we don't initialize the dependency_manager first. https://codereview.chromium.org/1280903003/diff/210001/tools/telemetry/teleme... tools/telemetry/telemetry/testing/run_tests.py:174: def _SetUpProcess(child, context): # pylint: disable=W0613 On 2015/08/13 22:20:45, nednguyen wrote: > Nit: add comment explaining why we need to init the dependency manager again > here. Acknowledged.
ptal
The CQ bit was checked by aiolos@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from eakuefner@chromium.org, nednguyen@google.com Link to the patchset: https://codereview.chromium.org/1280903003/#ps230001 (title: "Nits")
lgtm
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1280903003/230001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1280903003/230001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: mac_perf_bisect on tryserver.chromium.perf (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.perf/builders/mac_perf_bisect/...)
On 2015/08/13 22:41:29, commit-bot: I haz the power wrote: > Try jobs failed on following builders: > mac_perf_bisect on tryserver.chromium.perf (JOB_FAILED, > http://build.chromium.org/p/tryserver.chromium.perf/builders/mac_perf_bisect/...) removing the mac_perf try job since it's failing on gclient hooks
The CQ bit was checked by aiolos@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1280903003/230001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1280903003/230001
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_...)
The CQ bit was checked by aiolos@chromium.org
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1280903003/230001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1280903003/230001
Message was sent while issue was closed.
Committed patchset #10 (id:230001)
Message was sent while issue was closed.
Patchset 10 (id:??) landed as https://crrev.com/f592ba18312f43fe4186cc526db00960a1db0b48 Cr-Commit-Position: refs/heads/master@{#343320}
Message was sent while issue was closed.
A revert of this CL (patchset #10 id:230001) has been created in https://codereview.chromium.org/1296563002/ by binjin@chromium.org. The reason for reverting is: speculative reverts: break the XP bots http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds....
Patchset #11 (id:250001) has been deleted
lgtm
The CQ bit was checked by aiolos@chromium.org
The patchset sent to the CQ was uploaded after l-g-t-m from eakuefner@chromium.org Link to the patchset: https://codereview.chromium.org/1280903003/#ps270001 (title: "Fix and refactor the unittest.")
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1280903003/270001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1280903003/270001
Message was sent while issue was closed.
Committed patchset #11 (id:270001)
Message was sent while issue was closed.
Patchset 11 (id:??) landed as https://crrev.com/780b193b7e92cef04c6c1063068e6f5edbf8e3f2 Cr-Commit-Position: refs/heads/master@{#343547} |