Snap for 6439596 from ccead650bb8e050400f55dc44b60f989b1f8e117 to qt-aml-tzdata-releaseq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I3464301d9b41d48e11dfd361a411d60a1bd5a429

1 files changed, 4 insertions, 9 deletions

diff --git a/crosperf/benchmark_unittest.py b/crosperf/benchmark_unittest.py
index 6c0c22f6..24c364c0 100755
--- a/crosperf/benchmark_unittest.py
+++ b/crosperf/benchmark_unittest.py
@@ -1,19 +1,15 @@
 #!/usr/bin/env python2
-# -*- coding: utf-8 -*-
 #
-# Copyright 2014 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
+# Copyright 2014 Google Inc.  All Rights Reserved
 """Unit tests for the Crosperf Benchmark class."""
 
 from __future__ import print_function
 
 import inspect
-import unittest
-
 from benchmark import Benchmark
 
+import unittest
+
 
 class BenchmarkTestCase(unittest.TestCase):
   """Individual tests for the Benchmark class."""
@@ -59,8 +55,7 @@ class BenchmarkTestCase(unittest.TestCase):
     # this test was updated.
     args_list = [
         'self', 'name', 'test_name', 'test_args', 'iterations', 'rm_chroot_tmp',
-        'perf_args', 'suite', 'show_all_results', 'retries', 'run_local',
-        'cwp_dso', 'weight', 'turbostat'
+        'perf_args', 'suite', 'show_all_results', 'retries', 'run_local'
     ]
     arg_spec = inspect.getargspec(Benchmark.__init__)
     self.assertEqual(len(arg_spec.args), len(args_list))