Fix automated tests

Author: misl6

.github/workflows/push.yml

@@ -63,7 +63,7 @@ jobs:
     - name: Build multi-arch apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
       run: |
         mkdir -p apks
-        make docker/run/make/with-artifact/testapps-with-numpy
+        make docker/run/make/with-artifact/apk/testapps-with-numpy
     - uses: actions/upload-artifact@v1
       with:
         name: bdist_unit_tests_app-debug-1.1-.apk
@@ -91,7 +91,7 @@ jobs:
     - name: Build Android App Bundle Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
       run: |
         mkdir -p aabs
-        make docker/run/make/with-artifact/testapps-with-numpy-aab
+        make docker/run/make/with-artifact/aab/testapps-with-numpy-aab
     - uses: actions/upload-artifact@v1
       with:
         name: bdist_unit_tests_app-release-1.1-.aab

Makefile

@@ -74,14 +74,18 @@ docker/run/test: docker/build
 docker/run/command: docker/build
 	docker run --rm --env-file=.env $(DOCKER_IMAGE) /bin/sh -c "$(COMMAND)"
 
-docker/run/make/%: docker/build
-	docker run --rm --env-file=.env $(DOCKER_IMAGE) make $*
+docker/run/make/with-artifact/apk/%: docker/build
+	docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
+	docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app-debug-1.1-.apk ./apks
+	docker rm -fv p4a-latest
 
-docker/run/make/with-artifact/%: docker/build
-	$(eval $@_APP_ARCH := $(shell basename $*))
+docker/run/make/with-artifact/aab/%: docker/build
 	docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
-	docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app__$($@_APP_ARCH)-debug-1.1-.apk ./apks
+	docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app-release-1.1-.aab ./aabs
 	docker rm -fv p4a-latest
 
+docker/run/make/%: docker/build
+	docker run --rm --env-file=.env $(DOCKER_IMAGE) make $*
+
 docker/run/shell: docker/build
 	docker run --rm --env-file=.env -it $(DOCKER_IMAGE)

pythonforandroid/bdistapk.py

@@ -164,6 +164,7 @@ def _set_user_options():
                 user_options.append((arg[2:], None, None))
 
     BdistAPK.user_options = user_options
+    BdistAAB.user_options = user_options
 
 
 _set_user_options()

setup.py

@@ -103,6 +103,7 @@ def recursively_include(results, directory, patterns):
           'distutils.commands': [
               'apk = pythonforandroid.bdistapk:BdistAPK',
               'aar = pythonforandroid.bdistapk:BdistAAR',
+              'aab = pythonforandroid.bdistapk:BdistAAB',
               ],
           },
       classifiers=[

testapps/on_device_unit_tests/setup.py

@@ -38,6 +38,20 @@
 # define a basic test app, which can be override passing the proper args to cli
 options = {
     'apk':
+        {
+            'requirements':
+                'sqlite3,libffi,openssl,pyjnius,kivy,python3,requests,urllib3,'
+                'chardet,idna',
+            'android-api': 27,
+            'ndk-api': 21,
+            'dist-name': 'bdist_unit_tests_app',
+            'arch': 'armeabi-v7a',
+            'bootstrap' : 'sdl2',
+            'permissions': ['INTERNET', 'VIBRATE'],
+            'orientation': 'sensor',
+            'service': 'P4a_test_service:app_service.py',
+        },
+    'aab':
         {
             'requirements':
                 'sqlite3,libffi,openssl,pyjnius,kivy,python3,requests,urllib3,'