diff options
| author | Yuexi Ma <yuexima@google.com> | 2018-04-02 19:18:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-02 19:18:42 +0000 |
| commit | 199c5af78bfa483ae6c528dea176b6da751d3fed (patch) | |
| tree | 8ebc0c7579b0c32cb043c58cd117c7ef47ae8f79 | |
| parent | 015be062fbb18b9da729f9318115385b144341e1 (diff) | |
| parent | 24bd73e08df6aae3849063ed76d5cd6a92a8cf23 (diff) | |
| download | nbu-199c5af78bfa483ae6c528dea176b6da751d3fed.tar.gz | |
Simplifying mobly module configs by removing test script am: b7562113ee am: 60ea808087
am: 24bd73e08d
Change-Id: I03ad43620d6e4df80353e22c0d9a92795ac1c6d8
| -rw-r--r-- | ble/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | ble/Ble.py | 24 | ||||
| -rw-r--r-- | bluetooth/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | bluetooth/Bluetooth.py | 24 |
4 files changed, 2 insertions, 50 deletions
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 |