diff options
| author | cmtice <cmtice@google.com> | 2014-06-13 15:38:45 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-07-09 22:28:29 +0000 |
| commit | c490e073c811f60d6fdfec5c193e7f042302b5e8 (patch) | |
| tree | 1150998b5e56c1e8ed92f8999c3e8892163a24e1 /crosperf/results_cache.py | |
| parent | 4536ef6c9da0f8c0c544552798c0bcf516519f73 (diff) | |
| download | toolchain-utils-c490e073c811f60d6fdfec5c193e7f042302b5e8.tar.gz | |
Update and expand regression tests for results_cache.py
BUG=None
TEST=Ran regression tests successfully. Ran 'normal' crosperf tests
successfully as well.
Change-Id: Ib3387cb63f1050cc0d561cc676d91be2334e0c79
Reviewed-on: https://chrome-internal-review.googlesource.com/166133
Reviewed-by: Caroline Tice <cmtice@google.com>
Commit-Queue: Caroline Tice <cmtice@google.com>
Tested-by: Caroline Tice <cmtice@google.com>
Diffstat (limited to 'crosperf/results_cache.py')
| -rw-r--r-- | crosperf/results_cache.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/crosperf/results_cache.py b/crosperf/results_cache.py index 35adf0d6..d584cbc4 100644 --- a/crosperf/results_cache.py +++ b/crosperf/results_cache.py @@ -34,10 +34,10 @@ class Result(object): perf.report, etc. The key generation is handled by the ResultsCache class. """ - def __init__(self, logger, label, log_level): + def __init__(self, logger, label, log_level, cmd_exec=None): self._chromeos_root = label.chromeos_root self._logger = logger - self._ce = command_executer.GetCommandExecuter(self._logger, + self._ce = cmd_exec or command_executer.GetCommandExecuter(self._logger, log_level=log_level) self._temp_dir = None self.label = label @@ -81,7 +81,7 @@ class Result(object): # Otherwise get the base filename and create the correct # path for it. f_dir, f_base = misc.GetRoot(f) - data_filename = os.path.join(self._chromeos_root, "/tmp", + data_filename = os.path.join(self._chromeos_root, "chroot/tmp", self._temp_dir, f_base) if os.path.exists(data_filename): with open(data_filename, "r") as data_file: @@ -384,8 +384,8 @@ class Result(object): class TelemetryResult(Result): - def __init__(self, logger, label, log_level): - super(TelemetryResult, self).__init__(logger, label, log_level) + def __init__(self, logger, label, log_level, cmd_exec=None): + super(TelemetryResult, self).__init__(logger, label, log_level, cmd_exec) def _PopulateFromRun(self, out, err, retval, show_all, test, suite): self.out = out @@ -512,9 +512,10 @@ class ResultsCache(object): else: cache_path = [os.path.join(SCRATCH_DIR, cache_dir)] - for i in [x.strip() for x in self.share_users.split(",")]: - path = SCRATCH_BASE % i - cache_path.append(os.path.join(path, cache_dir)) + if len(self.share_users): + for i in [x.strip() for x in self.share_users.split(",")]: + path = SCRATCH_BASE % i + cache_path.append(os.path.join(path, cache_dir)) return cache_path |