diff options
| author | Zhizhou Yang <zhizhouy@google.com> | 2020-01-15 16:25:04 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-30 00:33:44 +0000 |
| commit | 5534af8f4f31df22ca307e3e3faa16487fa3d2d2 (patch) | |
| tree | 771f9865e956551c7c70c3de99fad0b72aef52ce /crosperf/experiment_runner_unittest.py | |
| parent | 658d77957b84def71c77d25229df9845fdb7ee9c (diff) | |
| download | toolchain-utils-5534af8f4f31df22ca307e3e3faa16487fa3d2d2.tar.gz | |
crosperf: migration to python 3
This patch migrates crosperf and its utils to python 3.
TEST=Passed presubmit check; tested with simple experiment locally.
BUG=chromium:1011676
Change-Id: Ib2a9f9c7cf6a1bb1d0b42a1dd3d9e3cbb4d70a36
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2003796
Tested-by: Zhizhou Yang <zhizhouy@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Caroline Tice <cmtice@chromium.org>
Commit-Queue: Zhizhou Yang <zhizhouy@google.com>
Auto-Submit: Zhizhou Yang <zhizhouy@google.com>
Diffstat (limited to 'crosperf/experiment_runner_unittest.py')
| -rwxr-xr-x | crosperf/experiment_runner_unittest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crosperf/experiment_runner_unittest.py b/crosperf/experiment_runner_unittest.py index 8747de45..4905975c 100755 --- a/crosperf/experiment_runner_unittest.py +++ b/crosperf/experiment_runner_unittest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # Copyright (c) 2014 The Chromium OS Authors. All rights reserved. @@ -15,7 +15,7 @@ import os import time import unittest -import mock +import unittest.mock as mock import experiment_runner import experiment_status @@ -109,7 +109,7 @@ class ExperimentRunnerTest(unittest.TestCase): def make_fake_experiment(self): test_flag.SetTestMode(True) - experiment_file = ExperimentFile(io.BytesIO(EXPERIMENT_FILE_1)) + experiment_file = ExperimentFile(io.StringIO(EXPERIMENT_FILE_1)) experiment = ExperimentFactory().GetExperiment( experiment_file, working_directory='', log_dir='') return experiment @@ -409,7 +409,7 @@ class ExperimentRunnerTest(unittest.TestCase): @mock.patch.object(Result, 'CopyResultsTo') @mock.patch.object(Result, 'CleanUp') @mock.patch.object(Result, 'FormatStringTop5') - @mock.patch('__builtin__.open', new_callable=mock.mock_open) + @mock.patch('builtins.open', new_callable=mock.mock_open) def test_store_results(self, mock_open, mock_top5, mock_cleanup, mock_copy, _mock_text_report, mock_report, mock_writefile, mock_mkdir, mock_rmdir): |