commit f1053cd863951d3d73ed33f819207ad191ff370c
author Hsin-Yi Chen <hsinyichen@google.com> Tue Mar 28 18:34:51 2017 +0800
committer Hsin-Yi Chen <hsinyichen@google.com> Tue Mar 28 19:09:03 2017 +0800
tree 349f1943ade99a8c8fac09d9a9dc39bb8fd96843
parent f910967d6a639ea2459e1c5faa3d3a1eb167aad9

Rename setUpTest/tearDownTest in performance tests

Test: vts-tradefed run commandAndExit vts -m BinderPerformanceTest
Bug: 28767742
Change-Id: I6a8c07ba221cafff5095abf02adaaa9a4df7f7e1

binder_benchmark/BinderPerformanceTest.py

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 @@
         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):

binder_throughput_test/BinderThroughputBenchmark.py

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 @@
         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):

fmq_benchmark/FmqPerformanceTest.py

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 @@
     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):

hwbinder_benchmark/HwBinderPerformanceTest.py

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 @@
         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):

hwbinder_throughput_test/HwBinderThroughputBenchmark.py

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 @@
         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):