🚀 Make test app on_device_unit_tests the default...

for our CI providers and `rebuild_updated_recipes.py` because we recently removed
the old test app that we made use of.

Author: opacam

.github/workflows/push.yml

@@ -60,7 +60,7 @@ jobs:
         make docker/run/make/with-artifact/testapps/python3/${{ matrix.build-arch }}
     - uses: actions/upload-artifact@v1
       with:
-        name: bdisttest_python3_sqlite_openssl_googlendk__${{ matrix.build-arch }}-debug-1.1.apk
+        name: bdist_test_app_unittests__${{ matrix.build-arch }}-debug-1.1.apk
         path: apks
 
   rebuild_updated_recipes:

Makefile

@@ -36,19 +36,19 @@ rebuild_updated_recipes: virtualenv
 	$(PYTHON) ci/rebuild_updated_recipes.py
 
 testapps/python2/armeabi-v7a: virtualenv
-	. $(ACTIVATE) && cd testapps/ && \
-    python setup_testapp_python2_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
+    python setup_test_app.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
     --requirements sdl2,pyjnius,kivy,python2,openssl,requests,sqlite3,setuptools
 
 testapps/python3/arm64-v8a: virtualenv
-	. $(ACTIVATE) && cd testapps/ && \
-    python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
+    python setup_test_app.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
     --requirements libffi,sdl2,pyjnius,kivy,python3,openssl,requests,sqlite3,setuptools,numpy \
     --arch=arm64-v8a
 
 testapps/python3/armeabi-v7a: virtualenv
-	. $(ACTIVATE) && cd testapps/ && \
-    python setup_testapp_python3_sqlite_openssl.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
+	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
+    python setup_test_app.py apk --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
     --arch=armeabi-v7a
 
 clean:
@@ -77,14 +77,9 @@ docker/run/make/%: docker/build
 	docker run --rm --env-file=.env $(DOCKER_IMAGE) make $*
 
 docker/run/make/with-artifact/%: docker/build
-ifeq (,$(findstring python3,$($*)))
-	$(eval $@_APP_NAME := bdisttest_python3_sqlite_openssl_googlendk)
-else
-	$(eval $@_APP_NAME := bdisttest_python2_sqlite_openssl)
-endif
 	$(eval $@_APP_ARCH := $(shell basename $*))
 	docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
-	docker cp p4a-latest:/home/user/app/testapps/$($@_APP_NAME)__$($@_APP_ARCH)-debug-1.1-.apk ./apks
+	docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_test_app_unittests__$($@_APP_ARCH)-debug-1.1-.apk ./apks
 	docker rm -fv p4a-latest
 
 docker/run/shell: docker/build

ci/rebuild_updated_recipes.py

@@ -55,15 +55,13 @@ def build(target_python, requirements):
     """
     if not requirements:
         return
-    testapp = 'setup_testapp_python2.py'
+    testapp = 'setup_test_app.py'
     android_sdk_home = os.environ['ANDROID_SDK_HOME']
     android_ndk_home = os.environ['ANDROID_NDK_HOME']
-    if target_python == TargetPython.python3:
-        testapp = 'setup_testapp_python3_sqlite_openssl.py'
     requirements.add(target_python.name)
     requirements = ','.join(requirements)
     logger.info('requirements: {}'.format(requirements))
-    with current_directory('testapps/'):
+    with current_directory('testapps/on_device_unit_tests/'):
         # iterates to stream the output
         for line in sh.python(
                 testapp, 'apk', '--sdk-dir', android_sdk_home,