mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-21 09:46:19 +02:00
Code

Merge pull request #1190 from dmach/apiurl-no-trailing-slash

Browse Source 
store: Remove trailing slash from apiurl
This commit is contained in:
Daniel Mach 2022-11-07 14:14:37 +01:00 committed by GitHub
commit 6ddb8e4122
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osc/store.py
View File

@ -174,13 +174,22 @@ class Store:
assert node.tag == node_name
api.write_xml_node_to_file(node, path)
def _sanitize_apiurl(self, value):
# apiurl shouldn't end with a slash, strip it so we can use apiurl without modifications
# in config['api_host_options'][apiurl] and other places
if isinstance(value, str):
value = value.strip("/")
elif isinstance(value, bytes):
value = value.strip(b"/")
return value
@property
def apiurl(self):
return self.read_string("_apiurl")
return self._sanitize_apiurl(self.read_string("_apiurl"))
@apiurl.setter
def apiurl(self, value):
self.write_string("_apiurl", value)
self.write_string("_apiurl", self._sanitize_apiurl(value))
@property
def project(self):

8
tests/test_store.py
View File

@ -98,6 +98,14 @@ class TestStore(unittest.TestCase):
store2 = Store(self.tmpdir)
self.assertEqual(store2.apiurl, "https://example.com")
def test_apiurl_no_trailing_slash(self):
self.store.apiurl = "https://example.com/"
self.fileEquals("_apiurl", "https://example.com\n")
self.store.write_string("_apiurl", "https://example.com/")
self.fileEquals("_apiurl", "https://example.com/\n")
self.assertEqual(self.store.apiurl, "https://example.com")
def test_package(self):
self.fileEquals("_package", "package name\n")