mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-01-12 16:56:15 +01:00
Code

Fix apiurl_aliases handling in OscOptions.__getitem__

Browse Source
This commit is contained in:
Daniel Mach 2023-10-23 22:14:32 +02:00
parent ea7bebf1f2
commit c790134aa4
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/commandline.py
View File

@ -3870,7 +3870,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
src_apiurl = conf.config['apiurl'] src_apiurl = conf.config['apiurl']
if opts.to_apiurl: if opts.to_apiurl:
tgt_apiurl = conf.config['apiurl_aliases'].get(opts.to_apiurl, opts.to_apiurl) tgt_apiurl = conf.config.apiurl_aliases.get(opts.to_apiurl, opts.to_apiurl)
else: else:
tgt_apiurl = src_apiurl tgt_apiurl = src_apiurl

8
osc/conf.py
View File

@ -144,9 +144,10 @@ class OscOptions(BaseModel):
def __getitem__(self, name): def __getitem__(self, name):
field_name = self._get_field_name(name) field_name = self._get_field_name(name)
if field_name is None: if field_name is None and not hasattr(self, name):
return self.extra_fields[name] return self.extra_fields[name]
field_name = field_name or name
try: try:
return getattr(self, field_name) return getattr(self, field_name)
except AttributeError: except AttributeError:
@ -156,10 +157,11 @@ class OscOptions(BaseModel):
def __setitem__(self, name, value): def __setitem__(self, name, value):
field_name = self._get_field_name(name) field_name = self._get_field_name(name)
if field_name is None: if field_name is None and not hasattr(self, name):
self.extra_fields[name] = value self.extra_fields[name] = value
return return
field_name = field_name or name
setattr(self, field_name, value) setattr(self, field_name, value)
# compat function with the config dict # compat function with the config dict
@ -1617,7 +1619,7 @@ def config_set_option(section, opt, val=None, delete=False, update=True, creds_m
cp = get_configParser(config['conffile']) cp = get_configParser(config['conffile'])
if section != 'general': if section != 'general':
section = config['apiurl_aliases'].get(section, section) section = config.apiurl_aliases.get(section, section)
scheme, host, path = \ scheme, host, path = \
parse_apisrv_url(config.get('scheme', 'https'), section) parse_apisrv_url(config.get('scheme', 'https'), section)
section = urljoin(scheme, host, path) section = urljoin(scheme, host, path)

14
tests/test_conf.py
View File

@ -1,3 +1,4 @@
import importlib
import os import os
import shutil import shutil
import tempfile import tempfile
@ -104,6 +105,7 @@ plugin-option = plugin-host-option
class TestExampleConfig(unittest.TestCase): class TestExampleConfig(unittest.TestCase):
def setUp(self): def setUp(self):
importlib.reload(osc.conf)
self.tmpdir = tempfile.mkdtemp(prefix="osc_test_") self.tmpdir = tempfile.mkdtemp(prefix="osc_test_")
self.oscrc = os.path.join(self.tmpdir, "oscrc") self.oscrc = os.path.join(self.tmpdir, "oscrc")
with open(self.oscrc, "w", encoding="utf-8") as f: with open(self.oscrc, "w", encoding="utf-8") as f:
@ -407,6 +409,13 @@ class TestExampleConfig(unittest.TestCase):
self.assertEqual(self.config["plugin-option"], "plugin-general-option") self.assertEqual(self.config["plugin-option"], "plugin-general-option")
self.assertEqual(self.config.extra_fields, {"plugin-option": "plugin-general-option"}) self.assertEqual(self.config.extra_fields, {"plugin-option": "plugin-general-option"})
# write to an existing attribute instead of extra_fields
self.config.attrib = 123
self.assertEqual(self.config["attrib"], 123)
self.config["attrib"] = 456
self.assertEqual(self.config["attrib"], 456)
self.assertEqual(self.config.extra_fields, {"plugin-option": "plugin-general-option"})
self.config["new-option"] = "value" self.config["new-option"] = "value"
self.assertEqual(self.config["new-option"], "value") self.assertEqual(self.config["new-option"], "value")
self.assertEqual(self.config.extra_fields, {"plugin-option": "plugin-general-option", "new-option": "value"}) self.assertEqual(self.config.extra_fields, {"plugin-option": "plugin-general-option", "new-option": "value"})
@ -419,6 +428,11 @@ class TestExampleConfig(unittest.TestCase):
self.assertEqual(host_options["new-option"], "value") self.assertEqual(host_options["new-option"], "value")
self.assertEqual(host_options.extra_fields, {"plugin-option": "plugin-host-option", "new-option": "value"}) self.assertEqual(host_options.extra_fields, {"plugin-option": "plugin-host-option", "new-option": "value"})
def test_apiurl_aliases(self):
expected = {"https://api.opensuse.org": "https://api.opensuse.org", "osc": "https://api.opensuse.org"}
self.assertEqual(self.config.apiurl_aliases, expected)
self.assertEqual(self.config["apiurl_aliases"], expected)
class TestFromParent(unittest.TestCase): class TestFromParent(unittest.TestCase):
def setUp(self): def setUp(self):