diff options
| author | Caroline Tice <cmtice@google.com> | 2015-12-09 12:42:13 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-12-10 00:02:46 +0000 |
| commit | 6e8726de19436e28c4d22c3f3dc3bbae87dd4c12 (patch) | |
| tree | 07b843f5713076e46ecc9d697dc55340c25966b3 /crosperf | |
| parent | e55d35ee104a41e5f7ae96f4e326f33f6beaf412 (diff) | |
| download | toolchain-utils-6e8726de19436e28c4d22c3f3dc3bbae87dd4c12.tar.gz | |
Fix various Mock classes & calls so dry runs work.
The --dry_run option has been failing because parameter changes in
real classes have not always been reflected in Mock classes. This CL
fixes that.
BUG=chromium:545211
TEST=tested both real and --dry_run runs of Crosperf.
Change-Id: I0d0aa144e9fb3c40e1a95314691eacffb007cbe4
Reviewed-on: https://chrome-internal-review.googlesource.com/241525
Commit-Ready: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Reviewed-by: Yunlian Jiang <yunlian@google.com>
Diffstat (limited to 'crosperf')
| -rwxr-xr-x | crosperf/crosperf.py | 2 | ||||
| -rw-r--r-- | crosperf/experiment_factory.py | 2 | ||||
| -rw-r--r-- | crosperf/experiment_runner.py | 4 | ||||
| -rw-r--r-- | crosperf/label.py | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/crosperf/crosperf.py b/crosperf/crosperf.py index e107ea48..21553909 100755 --- a/crosperf/crosperf.py +++ b/crosperf/crosperf.py @@ -119,7 +119,7 @@ def Main(argv): atexit.register(Cleanup, experiment) if options.dry_run: - runner = MockExperimentRunner(experiment) + runner = MockExperimentRunner(experiment, json_report) else: runner = ExperimentRunner(experiment, json_report, using_schedv2=(not options.noschedv2)) diff --git a/crosperf/experiment_factory.py b/crosperf/experiment_factory.py index 8e207db4..2ba291ba 100644 --- a/crosperf/experiment_factory.py +++ b/crosperf/experiment_factory.py @@ -234,7 +234,7 @@ class ExperimentFactory(object): if test_flag.GetTestMode(): # pylint: disable=too-many-function-args label = MockLabel(label_name, image, chromeos_root, board, my_remote, - image_args, cache_dir, cache_only, + image_args, cache_dir, cache_only, log_level, compiler, chrome_src) else: label = Label(label_name, image, chromeos_root, board, my_remote, diff --git a/crosperf/experiment_runner.py b/crosperf/experiment_runner.py index 982432dd..7167b805 100644 --- a/crosperf/experiment_runner.py +++ b/crosperf/experiment_runner.py @@ -267,8 +267,8 @@ class ExperimentRunner(object): class MockExperimentRunner(ExperimentRunner): """Mocked ExperimentRunner for testing.""" - def __init__(self, experiment): - super(MockExperimentRunner, self).__init__(experiment) + def __init__(self, experiment, json_report): + super(MockExperimentRunner, self).__init__(experiment, json_report) def _Run(self, experiment): self.l.LogOutput("Would run the following experiment: '%s'." % diff --git a/crosperf/label.py b/crosperf/label.py index 8f063129..2d8be114 100644 --- a/crosperf/label.py +++ b/crosperf/label.py @@ -101,7 +101,8 @@ class Label(object): class MockLabel(object): def __init__(self, name, chromeos_image, chromeos_root, board, remote, - image_args, cache_dir, cache_only, chrome_src=None): + image_args, cache_dir, cache_only, log_level, compiler, + chrome_src=None): self.name = name self.chromeos_image = chromeos_image self.board = board @@ -116,6 +117,8 @@ class MockLabel(object): self.chrome_src = chrome_src self.image_type = self._GetImageType(chromeos_image) self.checksum = '' + self.log_level = log_level + self.compiler = compiler def _GetImageType(self, chromeos_image): image_type = None |