zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-24 03:30:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

review changes and linting

Browse source
This commit is contained in:
matthewswspence 2024-12-13 15:27:57 -06:00
parent 63c2b7907f
commit 32789faec6
No known key found for this signature in database
GPG key ID: FB458202A7852BA4
3 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/epplibwrapper/errors.py
View file

@ -62,7 +62,7 @@ class RegistryError(Exception):
- 2501 - 2502 Something malicious or abusive may have occurred
"""
def __init__(self, *args, code=None, note="",**kwargs):
def __init__(self, *args, code=None, note="", **kwargs):
super().__init__(*args, **kwargs)
self.code = code
# note is a string that can be used to provide additional context

4
src/registrar/models/domain.py
View file

@ -1033,7 +1033,7 @@ class Domain(TimeStampedModel, DomainHelper):
# if registry error occurs, log the error, and raise it as well
logger.error(f"registry error removing client hold: {err}")
raise (err)
def _delete_domain(self):
"""This domain should be deleted from the registry
may raises RegistryError, should be caught or handled correctly by caller"""
@ -1048,7 +1048,7 @@ class Domain(TimeStampedModel, DomainHelper):
code=ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION,
note=f"Host {host.name} is in use by {host.domain}",
)
(
deleted_values,
updated_values,

72
src/registrar/tests/test_models_domain.py
View file

@ -2684,8 +2684,8 @@ class TestAnalystDelete(MockEppLib):
[
call(
commands.UpdateDomain(
name='freeman.gov',
add=[common.Status(state=Domain.Status.CLIENT_HOLD, description='', lang='en')],
name="freeman.gov",
add=[common.Status(state=Domain.Status.CLIENT_HOLD, description="", lang="en")],
rem=[],
nsset=None,
keyset=None,
@ -2694,19 +2694,43 @@ class TestAnalystDelete(MockEppLib):
),
cleaned=True,
),
]
)
self.mockedSendFunction.assert_has_calls(
[
call(
commands.InfoDomain(name='freeman.gov', auth_info=None),
commands.InfoDomain(name="freeman.gov", auth_info=None),
cleaned=True,
),
call(
commands.InfoHost(name='fake.host.com'),
commands.InfoHost(name="fake.host.com"),
cleaned=True,
),
call(
commands.UpdateDomain(
name='freeman.gov',
name="freeman.gov",
add=[],
rem=[common.HostObjSet(hosts=['fake.host.com'])],
rem=[common.HostObjSet(hosts=["fake.host.com"])],
nsset=None,
keyset=None,
registrant=None,
auth_info=None,
),
cleaned=True,
),
]
)
self.mockedSendFunction.assert_has_calls(
[
call(
commands.DeleteHost(name="fake.host.com"),
cleaned=True,
),
call(
commands.UpdateDomain(
name="freeman.gov",
add=[],
rem=[common.DomainContact(contact="adminContact", type="admin")],
nsset=None,
keyset=None,
registrant=None,
@ -2715,14 +2739,14 @@ class TestAnalystDelete(MockEppLib):
cleaned=True,
),
call(
commands.DeleteHost(name='fake.host.com'),
commands.DeleteContact(id="adminContact"),
cleaned=True,
),
call(
commands.UpdateDomain(
name='freeman.gov',
name="freeman.gov",
add=[],
rem=[common.DomainContact(contact='adminContact', type='admin')],
rem=[common.DomainContact(contact="techContact", type="tech")],
nsset=None,
keyset=None,
registrant=None,
@ -2731,32 +2755,20 @@ class TestAnalystDelete(MockEppLib):
cleaned=True,
),
call(
commands.DeleteContact(id='adminContact'),
cleaned=True,
),
call(
commands.UpdateDomain(
name='freeman.gov',
add=[],
rem=[common.DomainContact(contact='techContact', type='tech')],
nsset=None,
keyset=None,
registrant=None,
auth_info=None,
),
cleaned=True,
),
call(
commands.DeleteContact(id='techContact'),
cleaned=True,
),
call(
commands.DeleteDomain(name='freeman.gov'),
commands.DeleteContact(id="techContact"),
cleaned=True,
),
],
any_order=True,
)
self.mockedSendFunction.assert_has_calls(
[
call(
commands.DeleteDomain(name="freeman.gov"),
cleaned=True,
),
],
)
# Domain itself should not be deleted
self.assertNotEqual(self.domain_with_contacts, None)