mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 14:30:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

all ndk paths in config must be strings

Browse source 
The paths in the config must be strings because they are used in things
like env vars where they must be strings.  Plus lots of other places in the
code assumes they are strings.  This is the first step to defining the
border of where paths can be pathlib.Path() and where they must be strings.
This commit is contained in:
Hans-Christoph Steiner 2023-03-27 15:54:43 +02:00
parent 898624dcac
commit 36d2a8f899
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
4 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tests/common.TestCase
View file

@ -2371,6 +2371,37 @@ class CommonTest(unittest.TestCase):
)
for f in config['java_paths'].values():
self.assertTrue(f in java_paths)
self.assertTrue(isinstance(f, str)) # paths in config must be str
@mock.patch.dict(os.environ, clear=True)
def test_sdk_path_in_config_must_be_strings(self):
"""All paths in config must be strings, and never pathlib.Path instances"""
os.environ['PATH'] = '/usr/bin:/usr/sbin'
config = {'sdk_path': Path('/opt/android-sdk')}
fdroidserver.common.fill_config_defaults(config)
build = fdroidserver.metadata.Build()
with self.assertRaises(TypeError):
fdroidserver.common.set_FDroidPopen_env(build)
@mock.patch.dict(os.environ, clear=True)
def test_ndk_paths_in_config_must_be_strings(self):
"""All paths in config must be strings, and never pathlib.Path instances"""
fdroidserver.common.config = {
'ndk_paths': {'r21d': Path('/opt/android-sdk/ndk/r21d')}
}
build = fdroidserver.metadata.Build()
build.ndk = 'r21d'
os.environ['PATH'] = '/usr/bin:/usr/sbin'
with self.assertRaises(TypeError):
fdroidserver.common.set_FDroidPopen_env(build)
@mock.patch.dict(os.environ, clear=True)
def test_FDroidPopen_envs_paths_can_be_pathlib(self):
os.environ['PATH'] = '/usr/bin:/usr/sbin'
envs = {'PATHLIB': Path('/pathlib/path'), 'STRING': '/string/path'}
p = fdroidserver.common.FDroidPopen(['/bin/sh', '-c', 'export'], envs=envs)
self.assertIn('/string/path', p.output)
self.assertIn('/pathlib/path', p.output)
def test_vcs_git_latesttags(self):
tags = [