From b7562113ee05eacd4a8952d72112f3b426a5b283 Mon Sep 17 00:00:00 2001
From: Yuexi Ma <yuexima@google.com>
Date: Fri, 30 Mar 2018 21:08:30 -0700
Subject: Simplifying mobly module configs by removing test script

Test: run vts-p2p
Change-Id: Ifafd4ca8e463f49b2175545149a496ff812c3d86
---
 ble/AndroidTest.xml       |  2 +-
 ble/Ble.py                | 24 ------------------------
 bluetooth/AndroidTest.xml |  2 +-
 bluetooth/Bluetooth.py    | 24 ------------------------
 4 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 ble/Ble.py
 delete mode 100644 bluetooth/Bluetooth.py

diff --git a/ble/AndroidTest.xml b/ble/AndroidTest.xml
index 3450fb4..03eee24 100644
--- a/ble/AndroidTest.xml
+++ b/ble/AndroidTest.xml
@@ -23,6 +23,6 @@
         <option name="test-module-name" value="VtsNbuBle" />
         <option name="test-timeout" value="10m" />
         <option name="runtime-hint" value="3m" />
-        <option name="test-case-path" value="vts/testcases/nbu/ble/Ble" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.ble_test.BleTest" />
     </test>
 </configuration>
diff --git a/ble/Ble.py b/ble/Ble.py
deleted file mode 100644
index bfa6295..0000000
--- a/ble/Ble.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from vts.runners.host import test_runner
-
-from vts.testcases.template.mobly.mobly_test import MoblyTest
-from vts.testcases.nbu.src.ble_test import BleTest
-
-
-if __name__ == "__main__":
-    test_runner.main()
\ No newline at end of file
diff --git a/bluetooth/AndroidTest.xml b/bluetooth/AndroidTest.xml
index 689f4e8..c2925a1 100644
--- a/bluetooth/AndroidTest.xml
+++ b/bluetooth/AndroidTest.xml
@@ -23,6 +23,6 @@
         <option name="test-module-name" value="VtsNbuBluetooth" />
         <option name="test-timeout" value="10m" />
         <option name="runtime-hint" value="1m" />
-        <option name="test-case-path" value="vts/testcases/nbu/bluetooth/Bluetooth" />
+        <option name="mobly-test-module" value="vts.testcases.nbu.src.bluetooth_test.BluetoothTest" />
     </test>
 </configuration>
diff --git a/bluetooth/Bluetooth.py b/bluetooth/Bluetooth.py
deleted file mode 100644
index 2b094ae..0000000
--- a/bluetooth/Bluetooth.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-from vts.runners.host import test_runner
-
-from vts.testcases.template.mobly.mobly_test import MoblyTest
-from vts.testcases.nbu.src.bluetooth_test import BluetoothTest
-
-
-if __name__ == "__main__":
-    test_runner.main()
\ No newline at end of file
-- 
cgit v1.2.3