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

Lazyload environment variables in config.yml

Browse source
This commit is contained in:
linsui 2025-06-11 13:02:09 +00:00 • committed by Hans-Christoph Steiner
parent e44fd22199
commit cd1630d2f5
2 changed files with 101 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

55
tests/test_common.py
View file

@ -2029,6 +2029,49 @@ class CommonTest(SetUpTearDownMixin, unittest.TestCase):
config = fdroidserver.common.read_config()
self.assertEqual('/usr/lib/jvm/java-8-openjdk', config['java_paths']['8'])
@mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
def test_config_lazy_load_env_vars(self):
"""Test the environment variables in config.yml is lazy loaded.
It shouldn't throw errors when read the config if the environment variables are
not set. It should throw errors when the variables are get from the config.
"""
os.chdir(self.testdir)
fdroidserver.common.write_config_file(
textwrap.dedent(
"""
serverwebroot: {env: serverwebroot}
servergitmirrors:
- url: {env: mirror1}
- url: {env: mirror2}
keypass: {env: keypass}
keystorepass: {env: keystorepass}
"""
)
)
with self.assertNoLogs(level=logging.ERROR):
config = fdroidserver.common.read_config()
# KeyError should be raised if a key is not in the config.yml
with self.assertRaises(KeyError):
config['gpghome']
self.assertEqual(config.get('gpghome', 'gpg'), 'gpg')
os.environ.update({key: f"{key}supersecret" for key in ["serverwebroot", "mirror1", "mirror2", "keystorepass"]})
self.assertEqual(config['keystorepass'], 'keystorepasssupersecret')
self.assertEqual(config['serverwebroot'], [{'url': 'serverwebrootsupersecret/'}])
self.assertEqual(config['servergitmirrors'], [{'url': 'mirror1supersecret'}, {'url': 'mirror2supersecret'}])
@mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
def test_config_lazy_load_env_vars_not_set(self):
os.chdir(self.testdir)
fdroidserver.common.write_config_file('keypass: {env: keypass}')
fdroidserver.common.read_config()
with self.assertLogs(level=logging.ERROR) as lw:
fdroidserver.common.config['keypass']
self.assertTrue('is not set' in lw.output[0])
self.assertEqual(1, len(lw.output))
@mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
def test_test_sdk_exists_fails_on_bad_sdk_path(self):
config = {'sdk_path': 'nothinghere'}
@ -3465,7 +3508,7 @@ class ConfigOptionsScopeTest(unittest.TestCase):
self.assertIsNone(fdroidserver.common.config)
config = fdroidserver.common.read_config()
self.assertIsNotNone(fdroidserver.common.config)
self.assertEqual(dict, type(config))
self.assertTrue(isinstance(config, dict))
self.assertEqual(config, fdroidserver.common.config)
def test_get_config_global(self):
@ -3475,7 +3518,7 @@ class ConfigOptionsScopeTest(unittest.TestCase):
self.assertIsNone(fdroidserver.common.config)
c = fdroidserver.common.read_config()
self.assertIsNotNone(fdroidserver.common.config)
self.assertEqual(dict, type(c))
self.assertTrue(isinstance(c, dict))
self.assertEqual(c, fdroidserver.common.config)
self.assertTrue(
'config' not in vars() and 'config' not in globals(),
@ -3515,14 +3558,6 @@ class UnsafePermissionsTest(SetUpTearDownMixin, unittest.TestCase):
self.assertTrue('unsafe' in lw.output[0])
self.assertEqual(1, len(lw.output))
@mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True)
def test_config_perm_unset_env_no_warning(self):
fdroidserver.common.write_config_file('keypass: {env: keypass}')
with self.assertLogs(level=logging.WARNING) as lw:
fdroidserver.common.read_config()
self.assertTrue('unsafe' not in lw.output[0])
self.assertEqual(1, len(lw.output))
class GetHeadCommitIdTest(unittest.TestCase):
"""Test and compare two methods of getting the commit ID."""