merge in pi-release history after reset to master
diff --git a/src/README.md b/README.md
similarity index 100%
rename from src/README.md
rename to README.md
diff --git a/src/android_snippet.apk b/android_snippet.apk
similarity index 100%
rename from src/android_snippet.apk
rename to android_snippet.apk
Binary files differ
diff --git a/ble/Android.mk b/ble/Android.mk
deleted file mode 100644
index 7160fb1..0000000
--- a/ble/Android.mk
+++ /dev/null
@@ -1,23 +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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsNbuBle
-VTS_CONFIG_SRC_DIR := testcases/nbu/ble
--include test/vts/tools/build/Android.host_config.mk
diff --git a/ble/AndroidTest.xml b/ble/AndroidTest.xml
deleted file mode 100644
index 7e65e32..0000000
--- a/ble/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<configuration description="Config for VTS Next Billion User Bluetooth Low Energy test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-p2p" />
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- <option name="dep-module" value="mobly" />
- </multi_target_preparer>
-
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <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" />
- </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/ble/__init__.py b/ble/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/ble/__init__.py
+++ /dev/null
diff --git a/src/ble_test.py b/ble_test.py
similarity index 99%
rename from src/ble_test.py
rename to ble_test.py
index f5092be..58fe5f9 100644
--- a/src/ble_test.py
+++ b/ble_test.py
@@ -5,7 +5,7 @@
from mobly import asserts
-from mobly import test_runner
+from mobly import mobly_g3
from mobly import utils
from utils import android_base_test
@@ -542,4 +542,4 @@
if __name__ == '__main__':
- test_runner.main()
+ mobly_g3.main()
diff --git a/bluetooth/Android.mk b/bluetooth/Android.mk
deleted file mode 100644
index ab0fd3c..0000000
--- a/bluetooth/Android.mk
+++ /dev/null
@@ -1,23 +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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VtsNbuBluetooth
-VTS_CONFIG_SRC_DIR := testcases/nbu/bluetooth
--include test/vts/tools/build/Android.host_config.mk
diff --git a/bluetooth/AndroidTest.xml b/bluetooth/AndroidTest.xml
deleted file mode 100644
index 2dd57ed..0000000
--- a/bluetooth/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<configuration description="Config for VTS Next Billion User Bluetooth test cases">
- <option name="config-descriptor:metadata" key="plan" value="vts-p2p" />
- <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
- <option name="dep-module" value="mobly" />
- </multi_target_preparer>
-
- <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <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" />
- </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
diff --git a/bluetooth/__init__.py b/bluetooth/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/bluetooth/__init__.py
+++ /dev/null
diff --git a/src/bluetooth_test.py b/bluetooth_test.py
similarity index 98%
rename from src/bluetooth_test.py
rename to bluetooth_test.py
index 0519bf3..0fa96a5 100644
--- a/src/bluetooth_test.py
+++ b/bluetooth_test.py
@@ -3,7 +3,7 @@
from mobly import asserts
-from mobly import test_runner
+from mobly import mobly_g3
from mobly import utils
from utils import android_base_test
@@ -102,4 +102,4 @@
if __name__ == '__main__':
- test_runner.main()
+ mobly_g3.main()
diff --git a/src/local_hotspot_test.py b/local_hotspot_test.py
similarity index 97%
rename from src/local_hotspot_test.py
rename to local_hotspot_test.py
index 4bc02f8..774b9ed 100644
--- a/src/local_hotspot_test.py
+++ b/local_hotspot_test.py
@@ -5,7 +5,7 @@
from mobly import asserts
-from mobly import test_runner
+from mobly import mobly_g3
from utils import android_base_test
SSID = 'SSID'
@@ -68,4 +68,4 @@
if __name__ == '__main__':
- test_runner.main()
+ mobly_g3.main()
diff --git a/src/__init__.py b/src/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/src/__init__.py
+++ /dev/null
diff --git a/src/utils/__init__.py b/utils/__init__.py
similarity index 100%
rename from src/utils/__init__.py
rename to utils/__init__.py
diff --git a/src/utils/android_base_test.py b/utils/android_base_test.py
similarity index 100%
rename from src/utils/android_base_test.py
rename to utils/android_base_test.py
diff --git a/src/utils/assert_utils.py b/utils/assert_utils.py
similarity index 100%
rename from src/utils/assert_utils.py
rename to utils/assert_utils.py
diff --git a/src/wifi_direct_test.py b/wifi_direct_test.py
similarity index 97%
rename from src/wifi_direct_test.py
rename to wifi_direct_test.py
index d24e0c9..6f4b083 100644
--- a/src/wifi_direct_test.py
+++ b/wifi_direct_test.py
@@ -2,7 +2,7 @@
from mobly import asserts
-from mobly import test_runner
+from mobly import mobly_g3
from utils import android_base_test
from utils import assert_utils
@@ -69,4 +69,4 @@
if __name__ == '__main__':
- test_runner.main()
+ mobly_g3.main()
