Merge "Add DRM VTS test stubs" into oc-dev
diff --git a/automotive/vehicle/V2_0/host/VtsHalAutomotiveVehicleV2_0HostTest.py b/automotive/vehicle/V2_0/host/VtsHalAutomotiveVehicleV2_0HostTest.py
index da1e9a7..04f40ec 100644
--- a/automotive/vehicle/V2_0/host/VtsHalAutomotiveVehicleV2_0HostTest.py
+++ b/automotive/vehicle/V2_0/host/VtsHalAutomotiveVehicleV2_0HostTest.py
@@ -75,7 +75,7 @@
         if self.coverage.enabled:
             self.coverage.SetCoverageData(dut=self.dut, isGlobal=True)
 
-    def setUpTest(self):
+    def setUp(self):
         self.propToConfig = {}
         for config in self.vehicle.getAllPropConfigs():
             self.propToConfig[config['prop']] = config
diff --git a/contexthub/V1_0/host/VtsHalContexthubV1_0HostTest.py b/contexthub/V1_0/host/VtsHalContexthubV1_0HostTest.py
index d009cfb..c2ef363 100644
--- a/contexthub/V1_0/host/VtsHalContexthubV1_0HostTest.py
+++ b/contexthub/V1_0/host/VtsHalContexthubV1_0HostTest.py
@@ -96,7 +96,7 @@
         if self.profiling.enabled:
             self.profiling.ProcessAndUploadTraceData()
 
-    def tearDownTest(self):
+    def tearDown(self):
         """Process trace data.
         """
         if self.profiling.enabled:
diff --git a/radio/V1_0/host/VtsHalRadioV1_0HostTest.py b/radio/V1_0/host/VtsHalRadioV1_0HostTest.py
index 11c1d16..7af2b26 100644
--- a/radio/V1_0/host/VtsHalRadioV1_0HostTest.py
+++ b/radio/V1_0/host/VtsHalRadioV1_0HostTest.py
@@ -57,7 +57,7 @@
         if self.profiling.enabled:
             self.profiling.ProcessAndUploadTraceData()
 
-    def tearDownTest(self):
+    def tearDown(self):
         """Process trace data.
         """
         if self.profiling.enabled:
diff --git a/sensors/V1_0/host/VtsHalSensorsV1_0HostTest.py b/sensors/V1_0/host/VtsHalSensorsV1_0HostTest.py
index 1050724..717d9d0 100644
--- a/sensors/V1_0/host/VtsHalSensorsV1_0HostTest.py
+++ b/sensors/V1_0/host/VtsHalSensorsV1_0HostTest.py
@@ -58,11 +58,11 @@
         if self.profiling.enabled:
             self.profiling.ProcessAndUploadTraceData()
 
-    def setUpTest(self):
+    def setUp(self):
         if self.profiling.enabled:
             self.profiling.EnableVTSProfiling(self.dut.shell.one)
 
-    def tearDownTest(self):
+    def tearDown(self):
         if self.profiling.enabled:
             self.profiling.ProcessTraceDataForTestCase(self.dut)
             self.profiling.DisableVTSProfiling(self.dut.shell.one)
diff --git a/tv/cec/V1_0/host/VtsHalTvCecV1_0HostTest.py b/tv/cec/V1_0/host/VtsHalTvCecV1_0HostTest.py
index 9f47008..eb203f9 100644
--- a/tv/cec/V1_0/host/VtsHalTvCecV1_0HostTest.py
+++ b/tv/cec/V1_0/host/VtsHalTvCecV1_0HostTest.py
@@ -60,13 +60,13 @@
         self.vtypes = self.dut.hal.tv_cec.GetHidlTypeInterface("types")
         logging.info("tv_cec types: %s", self.vtypes)
 
-    def setUpTest(self):
+    def setUp(self):
         """Setup function that will be called every time before executing each
         test case in the test class."""
         if self.profiling.enabled:
             self.profiling.EnableVTSProfiling(self.dut.shell.one)
 
-    def tearDownTest(self):
+    def tearDown(self):
         """TearDown function that will be called every time after executing each
         test case in the test class."""
         if self.profiling.enabled:
diff --git a/tv/input/V1_0/host/VtsHalTvInputV1_0HostTest.py b/tv/input/V1_0/host/VtsHalTvInputV1_0HostTest.py
index 818b5ce..bacb19e 100644
--- a/tv/input/V1_0/host/VtsHalTvInputV1_0HostTest.py
+++ b/tv/input/V1_0/host/VtsHalTvInputV1_0HostTest.py
@@ -48,13 +48,13 @@
 
         self.dut.shell.InvokeTerminal("one")
 
-    def setUpTest(self):
+    def setUp(self):
         """Setup function that will be called every time before executing each
         test case in the test class."""
         if self.profiling.enabled:
             self.profiling.EnableVTSProfiling(self.dut.shell.one)
 
-    def tearDownTest(self):
+    def tearDown(self):
         """TearDown function that will be called every time after executing each
         test case in the test class."""
         if self.profiling.enabled:
diff --git a/vibrator/V1_0/host/VtsHalVibratorV1_0HostTest.py b/vibrator/V1_0/host/VtsHalVibratorV1_0HostTest.py
index 9ba6254..5d40cf9 100644
--- a/vibrator/V1_0/host/VtsHalVibratorV1_0HostTest.py
+++ b/vibrator/V1_0/host/VtsHalVibratorV1_0HostTest.py
@@ -53,11 +53,11 @@
         if self.profiling.enabled:
             self.profiling.ProcessAndUploadTraceData()
 
-    def setUpTest(self):
+    def setUp(self):
         if self.profiling.enabled:
             self.profiling.EnableVTSProfiling(self.dut.shell.one)
 
-    def tearDownTest(self):
+    def tearDown(self):
         if self.profiling.enabled:
             self.profiling.ProcessTraceDataForTestCase(self.dut)
             self.profiling.DisableVTSProfiling(self.dut.shell.one)
diff --git a/vr/V1_0/host/VtsHalVrV1_0HostTest.py b/vr/V1_0/host/VtsHalVrV1_0HostTest.py
index f22a070..c4b9186 100644
--- a/vr/V1_0/host/VtsHalVrV1_0HostTest.py
+++ b/vr/V1_0/host/VtsHalVrV1_0HostTest.py
@@ -54,11 +54,11 @@
         if self.profiling.enabled:
             self.profiling.ProcessAndUploadTraceData()
 
-    def setUpTest(self):
+    def setUp(self):
         if self.profiling.enabled:
             self.profiling.EnableVTSProfiling(self.dut.shell.one)
 
-    def tearDownTest(self):
+    def tearDown(self):
         if self.profiling.enabled:
             self.profiling.ProcessTraceDataForTestCase(self.dut)
             self.profiling.DisableVTSProfiling(self.dut.shell.one)