Skip to content

Commit

Permalink
Update default proxy parameter to content_default_http_proxy
Browse files Browse the repository at this point in the history
Signed-off-by: Gaurav Talreja <[email protected]>
  • Loading branch information
Gauravtalreja1 committed Jan 10, 2025
1 parent a237879 commit c904a05
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
4 changes: 2 additions & 2 deletions robottelo/host_helpers/api_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def make_http_proxy(self, org, http_proxy_type):
name=gen_string('alpha', 15),
url=settings.http_proxy.un_auth_proxy_url,
organization=[org.id],
default_content_http_proxy=True,
content_default_http_proxy=True,
).create()
if http_proxy_type:
return self._satellite.api.HTTPProxy(
Expand All @@ -47,7 +47,7 @@ def make_http_proxy(self, org, http_proxy_type):
username=settings.http_proxy.username,
password=settings.http_proxy.password,
organization=[org.id],
default_content_http_proxy=True,
content_default_http_proxy=True,
).create()
return None

Expand Down
20 changes: 14 additions & 6 deletions tests/foreman/ui/test_http_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,16 +277,24 @@ def test_positive_set_default_http_proxy(
{
'http_proxy.name': http_proxy_name,
'http_proxy.url': http_proxy_url,
'http_proxy.default_content_http_proxy': 'true',
'http_proxy.content_default_http_proxy': 'true',
'locations.resources.assigned': [module_location.name],
'organizations.resources.assigned': [module_org.name],
}
)
request.addfinalizer(
lambda: target_sat.api.HTTPProxy()
.search(query={'search': f'name={http_proxy_name}'})[0]
.delete()
)

# Teardown
@request.addfinalizer
def _finalize():
target_sat.api.HTTPProxy().search(query={'search': f'name={http_proxy_name}'})[
0
].delete()
default_proxy = target_sat.api.Setting().search(
query={'search': 'name=content_default_http_proxy'}
)[0]
assert default_proxy.value != http_proxy_name
assert not default_proxy.value

result = session.settings.read(f'name = {property_name}')
assert result['table'][0]['Value'] == f'{http_proxy_name} ({http_proxy_url})'

Expand Down

0 comments on commit c904a05

Please sign in to comment.