summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHsin-Yi Chen <hsinyichen@google.com>2017-03-31 02:23:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-31 02:23:00 +0000
commit1c691161b6bdbb0617f91e0fcb52014ccc1d5970 (patch)
tree349f1943ade99a8c8fac09d9a9dc39bb8fd96843
parente509e5c22b469fa38bdf68fdf510c4995b25bc47 (diff)
parent97a7943c71dfe68bfca3195a4b1af0cde91b2c03 (diff)
downloadperformance-1c691161b6bdbb0617f91e0fcb52014ccc1d5970.tar.gz
Rename setUpTest/tearDownTest in performance tests am: f1053cd863 am: 7856dcf033
am: 97a7943c71 Change-Id: I36da6ef84734bf1c94f5e077dc63014b9b104b63
-rw-r--r--binder_benchmark/BinderPerformanceTest.py4
-rw-r--r--binder_throughput_test/BinderThroughputBenchmark.py4
-rw-r--r--fmq_benchmark/FmqPerformanceTest.py4
-rw-r--r--hwbinder_benchmark/HwBinderPerformanceTest.py4
-rw-r--r--hwbinder_throughput_test/HwBinderThroughputBenchmark.py4
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):