Merge branch 'migrate-integration-tests-to-python' into 'master'

Migrate integration tests from Bash to Python

See merge request fdroid/fdroidserver!1587

fdroidserver/common.py

@@ -1126,13 +1126,23 @@ def apk_parse_release_filename(apkname):
     return None, None, None
 
 
+def get_output_extension(build):
+    if build.output:
+        return get_file_extension(replace_build_vars(build.output, build))
+    return 'apk'
+
+
+def get_release_apk_filename(appid, versionCode):
+    return f"{appid}_{versionCode}.apk"
+
+
 def get_release_filename(app, build, extension=None):
     if extension:
         return "%s_%s.%s" % (app.id, build.versionCode, extension)
     if build.output and get_file_extension(build.output):
         return "%s_%s.%s" % (app.id, build.versionCode, get_file_extension(build.output))
     else:
-        return "%s_%s.apk" % (app.id, build.versionCode)
+        return get_release_apk_filename(app.id, build.versionCode)
 
 
 def get_toolsversion_logname(app, build):

tests/shared_test_code.py

@@ -79,7 +79,7 @@ def mkdir_testfiles(localmodule, test):
     testroot.mkdir(exist_ok=True)
     testdir = testroot / unittest.TestCase.id(test)
     testdir.mkdir(exist_ok=True)
-    return tempfile.mkdtemp(dir=testdir)
+    return Path(tempfile.mkdtemp(dir=testdir))
 
 
 def mock_urlopen(status=200, body=None):