Merge "Update base test class."
diff --git a/binder_benchmark/BinderPerformanceTest.py b/binder_benchmark/BinderPerformanceTest.py
index b61b8c1..1d27a88 100644
--- a/binder_benchmark/BinderPerformanceTest.py
+++ b/binder_benchmark/BinderPerformanceTest.py
@@ -18,14 +18,13 @@
import logging
from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
+from vts.runners.host import base_test
from vts.runners.host import const
from vts.runners.host import test_runner
from vts.utils.python.controllers import android_device
from vts.utils.python.cpu import cpu_frequency_scaling
-
-class BinderPerformanceTest(base_test_with_webdb.BaseTestWithWebDbClass):
+class BinderPerformanceTest(base_test.BaseTestClass):
"""A testcase for the Binder Performance Benchmarking.
Attributes:
@@ -139,7 +138,7 @@
logging.info("result label for %sbits: %s", bits, label_result)
logging.info("result value for %sbits: %s", bits, value_result)
# To upload to the web DB.
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_vector_roundtrip_latency_benchmark_%sbits" % bits,
label_result,
value_result,
diff --git a/binder_throughput_test/BinderThroughputBenchmark.py b/binder_throughput_test/BinderThroughputBenchmark.py
index bf82068..be4c32d 100644
--- a/binder_throughput_test/BinderThroughputBenchmark.py
+++ b/binder_throughput_test/BinderThroughputBenchmark.py
@@ -19,7 +19,7 @@
from vts.proto import VtsReportMessage_pb2 as ReportMsg
from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
+from vts.runners.host import base_test
from vts.runners.host import const
from vts.runners.host import test_runner
from vts.utils.python.controllers import android_device
@@ -35,7 +35,7 @@
_TIME_PERCENTILE = "time_percentile"
-class BinderThroughputBenchmark(base_test_with_webdb.BaseTestWithWebDbClass):
+class BinderThroughputBenchmark(base_test.BaseTestClass):
"""A test case for the binder throughput benchmarking."""
def setUpClass(self):
@@ -91,43 +91,43 @@
time_percentile_99.append(result["time_percentile"][99])
# To upload to the web DB.
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_throughput_iterations_per_second_%sbits" % bits,
labels, iterations_per_second, x_axis_label="Number of Threads",
y_axis_label="Binder RPC Iterations Per Second",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_throughput_time_average_ns_%sbits" % bits,
labels, time_average, x_axis_label="Number of Threads",
y_axis_label="Binder RPC Time - Average (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_throughput_time_best_ns_%sbits" % bits,
labels, time_best, x_axis_label="Number of Threads",
y_axis_label="Binder RPC Time - Best Case (nanoseconds)")
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_throughput_time_worst_ns_%sbits" % bits,
labels, time_worst, x_axis_label="Number of Threads",
y_axis_label="Binder RPC Time - Worst Case (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_throughput_time_50percentile_ns_%sbits" % bits,
labels, time_percentile_50, x_axis_label="Number of Threads",
y_axis_label="Binder RPC Time - 50 Percentile (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_throughput_time_90percentile_ns_%sbits" % bits,
labels, time_percentile_90, x_axis_label="Number of Threads",
y_axis_label="Binder RPC Time - 90 Percentile (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_throughput_time_95percentile_ns_%sbits" % bits,
labels, time_percentile_95, x_axis_label="Number of Threads",
y_axis_label="Binder RPC Time - 95 Percentile (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"binder_throughput_time_99percentile_ns_%sbits" % bits,
labels, time_percentile_99, x_axis_label="Number of Threads",
y_axis_label="Binder RPC Time - 99 Percentile (nanoseconds)",
diff --git a/fmq_benchmark/FmqPerformanceTest.py b/fmq_benchmark/FmqPerformanceTest.py
index a32ce79..6d3ff70 100644
--- a/fmq_benchmark/FmqPerformanceTest.py
+++ b/fmq_benchmark/FmqPerformanceTest.py
@@ -18,14 +18,14 @@
import logging
from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
+from vts.runners.host import base_test
from vts.runners.host import const
from vts.runners.host import test_runner
from vts.utils.python.controllers import android_device
from vts.utils.python.cpu import cpu_frequency_scaling
-class FmqPerformanceTest(base_test_with_webdb.BaseTestWithWebDbClass):
+class FmqPerformanceTest(base_test.BaseTestClass):
"""A testcase for the Fast Message Queue(fmq) Performance Benchmarking.
Attributes:
@@ -126,14 +126,14 @@
write_latency.append(int(value))
# To upload to the web DB.
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"fmq_read_latency_benchmark_%sbits" % bits,
read_label,
read_latency,
x_axis_label="Message Size (Bytes)",
y_axis_label="Average Latency (nanoseconds)")
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"fmq_write_latency_benchmark_%sbits" % bits,
write_label,
write_latency,
diff --git a/hidl_trace_recorder/HidlTraceRecorder.py b/hidl_trace_recorder/HidlTraceRecorder.py
index 10637ac..247f67f 100644
--- a/hidl_trace_recorder/HidlTraceRecorder.py
+++ b/hidl_trace_recorder/HidlTraceRecorder.py
@@ -19,20 +19,20 @@
import os
from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
+from vts.runners.host import base_test
from vts.runners.host import const
from vts.runners.host import test_runner
from vts.utils.python.controllers import android_device
-class HidlTraceRecorder(base_test_with_webdb.BaseTestWithWebDbClass):
+class HidlTraceRecorder(base_test.BaseTestClass):
"""A HIDL HAL API trace recorder.
This class uses an apk which is packaged as part of VTS. It uses to test the
VTS TF's instrumentation preparer and post-processing modules. Those two
Java TF-side modules are cherry-picked to CTS to collect HIDL traces while
running various CTS test cases without having to package them as part of
- VTS.
+ VTS.
"""
CTS_TESTS = [
diff --git a/hwbinder_benchmark/HwBinderPerformanceTest.py b/hwbinder_benchmark/HwBinderPerformanceTest.py
index 1ee31db..c53d260 100644
--- a/hwbinder_benchmark/HwBinderPerformanceTest.py
+++ b/hwbinder_benchmark/HwBinderPerformanceTest.py
@@ -18,14 +18,14 @@
import logging
from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
+from vts.runners.host import base_test
from vts.runners.host import const
from vts.runners.host import test_runner
from vts.utils.python.controllers import android_device
from vts.utils.python.cpu import cpu_frequency_scaling
-class HwBinderPerformanceTest(base_test_with_webdb.BaseTestWithWebDbClass):
+class HwBinderPerformanceTest(base_test.BaseTestClass):
"""A test case for the HWBinder performance benchmarking.
Attributes:
@@ -148,7 +148,7 @@
logging.info("result label for %sbits: %s", bits, label_result)
logging.info("result value for %sbits: %s", bits, value_result)
# To upload to the web DB.
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_vector_roundtrip_latency_benchmark_%sbits" % bits,
label_result,
value_result,
diff --git a/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest.py b/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest.py
index 6e37f38..1a125ab 100644
--- a/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest.py
+++ b/hwbinder_benchmark_adb/HwBinderPerformanceAdbTest.py
@@ -18,14 +18,14 @@
import logging
from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
+from vts.runners.host import base_test
from vts.runners.host import const
from vts.runners.host import test_runner
from vts.utils.python.controllers import adb
from vts.utils.python.controllers import android_device
-class HwBinderPerformanceAdbTest(base_test_with_webdb.BaseTestWithWebDbClass):
+class HwBinderPerformanceAdbTest(base_test.BaseTestClass):
"""A test case for the HWBinder performance benchmarking.
Attributes:
@@ -136,7 +136,7 @@
logging.info("result label for %sbits: %s", bits, label_result)
logging.info("result value for %sbits: %s", bits, value_result)
# To upload to the web DB.
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_vector_roundtrip_latency_benchmark_%sbits" % bits,
label_result,
value_result,
diff --git a/hwbinder_throughput_test/HwBinderThroughputBenchmark.py b/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
index e5bfc3c..353083d 100644
--- a/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
+++ b/hwbinder_throughput_test/HwBinderThroughputBenchmark.py
@@ -19,7 +19,7 @@
from vts.proto import VtsReportMessage_pb2 as ReportMsg
from vts.runners.host import asserts
-from vts.runners.host import base_test_with_webdb
+from vts.runners.host import base_test
from vts.runners.host import const
from vts.runners.host import test_runner
from vts.utils.python.controllers import android_device
@@ -35,7 +35,7 @@
_TIME_PERCENTILE = "time_percentile"
-class HwBinderThroughputBenchmark(base_test_with_webdb.BaseTestWithWebDbClass):
+class HwBinderThroughputBenchmark(base_test.BaseTestClass):
"""A test case for the binder throughput benchmarking."""
def setUpClass(self):
@@ -93,43 +93,43 @@
time_percentile_99.append(result["time_percentile"][99])
# To upload to the web DB.
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_throughput_iterations_per_second_%sbits" % bits,
labels, iterations_per_second, x_axis_label="Number of Threads",
y_axis_label="HwBinder RPC Iterations Per Second",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_throughput_time_average_ns_%sbits" % bits,
labels, time_average, x_axis_label="Number of Threads",
y_axis_label="HwBinder RPC Time - Average (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_throughput_time_best_ns_%sbits" % bits,
labels, time_best, x_axis_label="Number of Threads",
y_axis_label="HwBinder RPC Time - Best Case (nanoseconds)")
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_throughput_time_worst_ns_%sbits" % bits,
labels, time_worst, x_axis_label="Number of Threads",
y_axis_label="HwBinder RPC Time - Worst Case (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_throughput_time_50percentile_ns_%sbits" % bits,
labels, time_percentile_50, x_axis_label="Number of Threads",
y_axis_label="HwBinder RPC Time - 50 Percentile (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_throughput_time_90percentile_ns_%sbits" % bits,
labels, time_percentile_90, x_axis_label="Number of Threads",
y_axis_label="HwBinder RPC Time - 90 Percentile (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_throughput_time_95percentile_ns_%sbits" % bits,
labels, time_percentile_95, x_axis_label="Number of Threads",
y_axis_label="HwBinder RPC Time - 95 Percentile (nanoseconds)",
regression_mode=ReportMsg.VTS_REGRESSION_MODE_DISABLED)
- self.AddProfilingDataLabeledVector(
+ self.web.AddProfilingDataLabeledVector(
"hwbinder_throughput_time_99percentile_ns_%sbits" % bits,
labels, time_percentile_99, x_axis_label="Number of Threads",
y_axis_label="HwBinder RPC Time - 99 Percentile (nanoseconds)",
