mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-15 19:50:29 +03:00
metadata.py/rewritemeta.py: use pathlib and support Windows
This commit is contained in:
linsui
parent
5635815898
commit
8f21f1e510
8 changed files with 768 additions and 511 deletions
|
|
@ -14,6 +14,7 @@ import unittest
|
|||
import yaml
|
||||
import zipfile
|
||||
from unittest import mock
|
||||
from pathlib import Path
|
||||
|
||||
localmodule = os.path.realpath(
|
||||
os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')
|
||||
|
|
@ -67,31 +68,134 @@ class BuildTest(unittest.TestCase):
|
|||
pass # aapt is not required if androguard is present
|
||||
|
||||
testcases = [
|
||||
('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1', None),
|
||||
('org.bitbucket.tickytacky.mirrormirror_1.apk', 'org.bitbucket.tickytacky.mirrormirror', '1', '1.0', None),
|
||||
('org.bitbucket.tickytacky.mirrormirror_2.apk', 'org.bitbucket.tickytacky.mirrormirror', '2', '1.0.1', None),
|
||||
('org.bitbucket.tickytacky.mirrormirror_3.apk', 'org.bitbucket.tickytacky.mirrormirror', '3', '1.0.2', None),
|
||||
('org.bitbucket.tickytacky.mirrormirror_4.apk', 'org.bitbucket.tickytacky.mirrormirror', '4', '1.0.3', None),
|
||||
('org.dyndns.fules.ck_20.apk', 'org.dyndns.fules.ck', '20', 'v1.6pre2',
|
||||
['arm64-v8a', 'armeabi', 'armeabi-v7a', 'mips', 'mips64', 'x86', 'x86_64']),
|
||||
(
|
||||
'repo/obb.main.twoversions_1101613.apk',
|
||||
'obb.main.twoversions',
|
||||
'1101613',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'org.bitbucket.tickytacky.mirrormirror_1.apk',
|
||||
'org.bitbucket.tickytacky.mirrormirror',
|
||||
'1',
|
||||
'1.0',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'org.bitbucket.tickytacky.mirrormirror_2.apk',
|
||||
'org.bitbucket.tickytacky.mirrormirror',
|
||||
'2',
|
||||
'1.0.1',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'org.bitbucket.tickytacky.mirrormirror_3.apk',
|
||||
'org.bitbucket.tickytacky.mirrormirror',
|
||||
'3',
|
||||
'1.0.2',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'org.bitbucket.tickytacky.mirrormirror_4.apk',
|
||||
'org.bitbucket.tickytacky.mirrormirror',
|
||||
'4',
|
||||
'1.0.3',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'org.dyndns.fules.ck_20.apk',
|
||||
'org.dyndns.fules.ck',
|
||||
'20',
|
||||
'v1.6pre2',
|
||||
[
|
||||
'arm64-v8a',
|
||||
'armeabi',
|
||||
'armeabi-v7a',
|
||||
'mips',
|
||||
'mips64',
|
||||
'x86',
|
||||
'x86_64',
|
||||
],
|
||||
),
|
||||
('urzip.apk', 'info.guardianproject.urzip', '100', '0.1', None),
|
||||
('urzip-badcert.apk', 'info.guardianproject.urzip', '100', '0.1', None),
|
||||
('urzip-badsig.apk', 'info.guardianproject.urzip', '100', '0.1', None),
|
||||
('urzip-release.apk', 'info.guardianproject.urzip', '100', '0.1', None),
|
||||
('urzip-release-unsigned.apk', 'info.guardianproject.urzip', '100', '0.1', None),
|
||||
(
|
||||
'urzip-release-unsigned.apk',
|
||||
'info.guardianproject.urzip',
|
||||
'100',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
('repo/com.politedroid_3.apk', 'com.politedroid', '3', '1.2', None),
|
||||
('repo/com.politedroid_4.apk', 'com.politedroid', '4', '1.3', None),
|
||||
('repo/com.politedroid_5.apk', 'com.politedroid', '5', '1.4', None),
|
||||
('repo/com.politedroid_6.apk', 'com.politedroid', '6', '1.5', None),
|
||||
('repo/duplicate.permisssions_9999999.apk', 'duplicate.permisssions', '9999999', '', None),
|
||||
('repo/info.zwanenburg.caffeinetile_4.apk', 'info.zwanenburg.caffeinetile', '4', '1.3', None),
|
||||
('repo/obb.main.oldversion_1444412523.apk', 'obb.main.oldversion', '1444412523', '0.1', None),
|
||||
('repo/obb.mainpatch.current_1619_another-release-key.apk', 'obb.mainpatch.current', '1619', '0.1', None),
|
||||
('repo/obb.mainpatch.current_1619.apk', 'obb.mainpatch.current', '1619', '0.1', None),
|
||||
('repo/obb.main.twoversions_1101613.apk', 'obb.main.twoversions', '1101613', '0.1', None),
|
||||
('repo/obb.main.twoversions_1101615.apk', 'obb.main.twoversions', '1101615', '0.1', None),
|
||||
('repo/obb.main.twoversions_1101617.apk', 'obb.main.twoversions', '1101617', '0.1', None),
|
||||
('repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk', 'info.guardianproject.urzip', '100', '0.1', None),
|
||||
(
|
||||
'repo/duplicate.permisssions_9999999.apk',
|
||||
'duplicate.permisssions',
|
||||
'9999999',
|
||||
'',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'repo/info.zwanenburg.caffeinetile_4.apk',
|
||||
'info.zwanenburg.caffeinetile',
|
||||
'4',
|
||||
'1.3',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'repo/obb.main.oldversion_1444412523.apk',
|
||||
'obb.main.oldversion',
|
||||
'1444412523',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'repo/obb.mainpatch.current_1619_another-release-key.apk',
|
||||
'obb.mainpatch.current',
|
||||
'1619',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'repo/obb.mainpatch.current_1619.apk',
|
||||
'obb.mainpatch.current',
|
||||
'1619',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'repo/obb.main.twoversions_1101613.apk',
|
||||
'obb.main.twoversions',
|
||||
'1101613',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'repo/obb.main.twoversions_1101615.apk',
|
||||
'obb.main.twoversions',
|
||||
'1101615',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'repo/obb.main.twoversions_1101617.apk',
|
||||
'obb.main.twoversions',
|
||||
'1101617',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
(
|
||||
'repo/urzip-; Рахма́, [rɐxˈmanʲɪnəf] سيرجي_رخمانينوف 谢·.apk',
|
||||
'info.guardianproject.urzip',
|
||||
'100',
|
||||
'0.1',
|
||||
None,
|
||||
),
|
||||
]
|
||||
for apkfilename, appid, versionCode, versionName, nativecode in testcases:
|
||||
app = fdroidserver.metadata.App()
|
||||
|
|
@ -259,14 +363,26 @@ class BuildTest(unittest.TestCase):
|
|||
|
||||
with mock.patch('fdroidserver.common.replace_build_vars', wraps=make_fake_apk):
|
||||
with mock.patch('fdroidserver.common.get_native_code', return_value='x86'):
|
||||
with mock.patch('fdroidserver.common.get_apk_id',
|
||||
return_value=(app.id, build.versionCode, build.versionName)):
|
||||
with mock.patch('fdroidserver.common.is_apk_and_debuggable', return_value=False):
|
||||
with mock.patch(
|
||||
'fdroidserver.common.get_apk_id',
|
||||
return_value=(app.id, build.versionCode, build.versionName),
|
||||
):
|
||||
with mock.patch(
|
||||
'fdroidserver.common.is_apk_and_debuggable', return_value=False
|
||||
):
|
||||
fdroidserver.build.build_local(
|
||||
app, build, vcs,
|
||||
build_dir=testdir, output_dir=testdir,
|
||||
log_dir=None, srclib_dir=None, extlib_dir=None, tmp_dir=None,
|
||||
force=False, onserver=False, refresh=False
|
||||
app,
|
||||
build,
|
||||
vcs,
|
||||
build_dir=testdir,
|
||||
output_dir=testdir,
|
||||
log_dir=None,
|
||||
srclib_dir=None,
|
||||
extlib_dir=None,
|
||||
tmp_dir=None,
|
||||
force=False,
|
||||
onserver=False,
|
||||
refresh=False,
|
||||
)
|
||||
|
||||
self.assertTrue(os.path.exists('foo.aar'))
|
||||
|
|
@ -360,7 +476,7 @@ class BuildTest(unittest.TestCase):
|
|||
}
|
||||
)
|
||||
app['Builds'] = [build]
|
||||
fdroidserver.metadata.write_metadata(metadata_file, app)
|
||||
fdroidserver.metadata.write_metadata(Path(metadata_file), app)
|
||||
|
||||
os.makedirs(os.path.join('unsigned', 'binaries'))
|
||||
production_result = os.path.join(
|
||||
|
|
|
|||
|
|
@ -220,9 +220,6 @@ class CheckupdatesTest(unittest.TestCase):
|
|||
|
||||
|
||||
if __name__ == "__main__":
|
||||
# TODO: Python3.6: Accept path-like object.
|
||||
os.chdir(str(Path(__file__).parent))
|
||||
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option(
|
||||
"-v",
|
||||
|
|
|
|||
|
|
@ -121,9 +121,6 @@ class ImportTest(unittest.TestCase):
|
|||
|
||||
|
||||
if __name__ == "__main__":
|
||||
# TODO: Python3.6: Support added to accept objects implementing the os.PathLike interface.
|
||||
os.chdir(str(Path(__file__).parent))
|
||||
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option(
|
||||
"-v",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,5 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
import inspect
|
||||
import logging
|
||||
import optparse
|
||||
import os
|
||||
|
|
@ -9,14 +8,15 @@ import unittest
|
|||
import tempfile
|
||||
import textwrap
|
||||
from unittest import mock
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
from testcommon import TmpCwd
|
||||
|
||||
localmodule = os.path.realpath(
|
||||
os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')
|
||||
)
|
||||
print('localmodule: ' + localmodule)
|
||||
localmodule = Path(__file__).resolve().parent.parent
|
||||
print('localmodule: ' + str(localmodule))
|
||||
if localmodule not in sys.path:
|
||||
sys.path.insert(0, localmodule)
|
||||
sys.path.insert(0, str(localmodule))
|
||||
|
||||
from fdroidserver import common
|
||||
from fdroidserver import rewritemeta
|
||||
|
|
@ -28,30 +28,29 @@ class RewriteMetaTest(unittest.TestCase):
|
|||
|
||||
def setUp(self):
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
self.basedir = os.path.join(localmodule, 'tests')
|
||||
self.tmpdir = os.path.abspath(os.path.join(self.basedir, '..', '.testfiles'))
|
||||
if not os.path.exists(self.tmpdir):
|
||||
os.makedirs(self.tmpdir)
|
||||
os.chdir(self.basedir)
|
||||
self.basedir = localmodule / 'tests'
|
||||
self.tmpdir = localmodule / '.testfiles'
|
||||
self.tmpdir.mkdir(exist_ok=True)
|
||||
# TODO: Python3.6: Accepts a path-like object.
|
||||
os.chdir(str(self.basedir))
|
||||
|
||||
def test_rewrite_scenario_trivial(self):
|
||||
|
||||
sys.argv = ['rewritemeta', 'a', 'b']
|
||||
|
||||
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
|
||||
os.mkdir('metadata')
|
||||
with open('metadata/a.yml', 'w') as f:
|
||||
Path('metadata').mkdir()
|
||||
with Path('metadata/a.yml').open('w') as f:
|
||||
f.write('AutoName: a')
|
||||
with open('metadata/b.yml', 'w') as f:
|
||||
with Path('metadata/b.yml').open('w') as f:
|
||||
f.write('AutoName: b')
|
||||
|
||||
rewritemeta.main()
|
||||
|
||||
with open('metadata/a.yml') as f:
|
||||
self.assertEqual(
|
||||
f.read(),
|
||||
textwrap.dedent(
|
||||
'''\
|
||||
self.assertEqual(
|
||||
Path('metadata/a.yml').read_text(),
|
||||
textwrap.dedent(
|
||||
'''\
|
||||
License: Unknown
|
||||
|
||||
AutoName: a
|
||||
|
|
@ -59,14 +58,13 @@ class RewriteMetaTest(unittest.TestCase):
|
|||
AutoUpdateMode: None
|
||||
UpdateCheckMode: None
|
||||
'''
|
||||
),
|
||||
)
|
||||
),
|
||||
)
|
||||
|
||||
with open('metadata/b.yml') as f:
|
||||
self.assertEqual(
|
||||
f.read(),
|
||||
textwrap.dedent(
|
||||
'''\
|
||||
self.assertEqual(
|
||||
Path('metadata/b.yml').read_text(),
|
||||
textwrap.dedent(
|
||||
'''\
|
||||
License: Unknown
|
||||
|
||||
AutoName: b
|
||||
|
|
@ -74,14 +72,14 @@ class RewriteMetaTest(unittest.TestCase):
|
|||
AutoUpdateMode: None
|
||||
UpdateCheckMode: None
|
||||
'''
|
||||
),
|
||||
)
|
||||
),
|
||||
)
|
||||
|
||||
def test_rewrite_scenario_yml_no_ruamel(self):
|
||||
sys.argv = ['rewritemeta', 'a']
|
||||
with tempfile.TemporaryDirectory() as tmpdir, TmpCwd(tmpdir):
|
||||
os.mkdir('metadata')
|
||||
with open('metadata/a.yml', 'w') as f:
|
||||
Path('metadata').mkdir()
|
||||
with Path('metadata/a.yml').open('w') as f:
|
||||
f.write('AutoName: a')
|
||||
|
||||
def boom(*args):
|
||||
|
|
@ -91,19 +89,12 @@ class RewriteMetaTest(unittest.TestCase):
|
|||
with self.assertRaises(FDroidException):
|
||||
rewritemeta.main()
|
||||
|
||||
with open('metadata/a.yml') as f:
|
||||
self.assertEqual(
|
||||
f.read(),
|
||||
textwrap.dedent(
|
||||
'''\
|
||||
AutoName: a'''
|
||||
),
|
||||
)
|
||||
self.assertEqual(
|
||||
Path('metadata/a.yml').read_text(), 'AutoName: a'
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
os.chdir(os.path.dirname(__file__))
|
||||
|
||||
parser = optparse.OptionParser()
|
||||
parser.add_option(
|
||||
"-v",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue