From f1053cd863951d3d73ed33f819207ad191ff370c Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Tue, 28 Mar 2017 18:34:51 +0800 Subject: Rename setUpTest/tearDownTest in performance tests Test: vts-tradefed run commandAndExit vts -m BinderPerformanceTest Bug: 28767742 Change-Id: I6a8c07ba221cafff5095abf02adaaa9a4df7f7e1 --- binder_benchmark/BinderPerformanceTest.py | 4 ++-- binder_throughput_test/BinderThroughputBenchmark.py | 4 ++-- fmq_benchmark/FmqPerformanceTest.py | 4 ++-- hwbinder_benchmark/HwBinderPerformanceTest.py | 4 ++-- hwbinder_throughput_test/HwBinderThroughputBenchmark.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/binder_benchmark/BinderPerformanceTest.py b/binder_benchmark/BinderPerformanceTest.py index 1d27a88..bade992 100644 --- a/binder_benchmark/BinderPerformanceTest.py +++ b/binder_benchmark/BinderPerformanceTest.py @@ -78,10 +78,10 @@ class BinderPerformanceTest(base_test.BaseTestClass): self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut) self._cpu_freq.DisableCpuScaling() - def setUpTest(self): + def setUp(self): self._cpu_freq.SkipIfThermalThrottling(retry_delay_secs=30) - def tearDownTest(self): + def tearDown(self): self._cpu_freq.SkipIfThermalThrottling() def tearDownClass(self): diff --git a/binder_throughput_test/BinderThroughputBenchmark.py b/binder_throughput_test/BinderThroughputBenchmark.py index be4c32d..5588f0c 100644 --- a/binder_throughput_test/BinderThroughputBenchmark.py +++ b/binder_throughput_test/BinderThroughputBenchmark.py @@ -44,10 +44,10 @@ class BinderThroughputBenchmark(base_test.BaseTestClass): self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut) self._cpu_freq.DisableCpuScaling() - def setUpTest(self): + def setUp(self): self._cpu_freq.SkipIfThermalThrottling(retry_delay_secs=30) - def tearDownTest(self): + def tearDown(self): self._cpu_freq.SkipIfThermalThrottling() def tearDownClass(self): diff --git a/fmq_benchmark/FmqPerformanceTest.py b/fmq_benchmark/FmqPerformanceTest.py index d2b4089..4013a1e 100644 --- a/fmq_benchmark/FmqPerformanceTest.py +++ b/fmq_benchmark/FmqPerformanceTest.py @@ -57,10 +57,10 @@ class FmqPerformanceTest(base_test.BaseTestClass): def tearDownClass(self): self._cpu_freq.EnableCpuScaling() - def setUpTest(self): + def setUp(self): self._cpu_freq.SkipIfThermalThrottling(retry_delay_secs=30) - def tearDownTest(self): + def tearDown(self): self._cpu_freq.SkipIfThermalThrottling() def testRunBenchmark32Bit(self): diff --git a/hwbinder_benchmark/HwBinderPerformanceTest.py b/hwbinder_benchmark/HwBinderPerformanceTest.py index c53d260..9135316 100644 --- a/hwbinder_benchmark/HwBinderPerformanceTest.py +++ b/hwbinder_benchmark/HwBinderPerformanceTest.py @@ -82,10 +82,10 @@ class HwBinderPerformanceTest(base_test.BaseTestClass): self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut) self._cpu_freq.DisableCpuScaling() - def setUpTest(self): + def setUp(self): self._cpu_freq.SkipIfThermalThrottling(retry_delay_secs=30) - def tearDownTest(self): + def tearDown(self): self._cpu_freq.SkipIfThermalThrottling() def tearDownClass(self): diff --git a/hwbinder_throughput_test/HwBinderThroughputBenchmark.py b/hwbinder_throughput_test/HwBinderThroughputBenchmark.py index 353083d..ffdf96c 100644 --- a/hwbinder_throughput_test/HwBinderThroughputBenchmark.py +++ b/hwbinder_throughput_test/HwBinderThroughputBenchmark.py @@ -46,10 +46,10 @@ class HwBinderThroughputBenchmark(base_test.BaseTestClass): self._cpu_freq = cpu_frequency_scaling.CpuFrequencyScalingController(self.dut) self._cpu_freq.DisableCpuScaling() - def setUpTest(self): + def setUp(self): self._cpu_freq.SkipIfThermalThrottling(retry_delay_secs=30) - def tearDownTest(self): + def tearDown(self): self._cpu_freq.SkipIfThermalThrottling() def tearDownClass(self): -- cgit v1.2.3