From fbad2abd9d228114241c2d107948d780b8b61d95 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Wed, 4 Oct 2023 09:14:09 -0700 Subject: [PATCH] Remove extraneous print statements and rename extendedValues to threeNS --- src/registrar/models/domain.py | 2 -- src/registrar/tests/common.py | 7 ++++--- src/registrar/tests/test_models_domain.py | 10 +++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index d758e1569..6e3a2304f 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -277,14 +277,12 @@ class Domain(TimeStampedModel, DomainHelper): return self.name in nameserver def checkHostIPCombo(self, nameserver: str, ip: list): - print("Do I come into checkHostIPCombo") if self.isSubdomain(nameserver) and (ip is None or ip == []): raise ValueError( "Nameserver %s needs to have an " "IP address because it is a subdomain" % nameserver ) elif not self.isSubdomain(nameserver) and (ip is not None and ip != []): - print("In 2nd else statement") raise ValueError( "Nameserver %s cannot be linked " "because %s is not a subdomain" % (nameserver, ip) diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 5a3887f3b..dce377188 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -644,14 +644,15 @@ class MockEppLib(TestCase): ], ) - # TODO-848: Fix naming - extendedValues = False + # Bc we have multiple tests utilizing 3 nameservers, + # easier to set a flag for it + threeNS = False def _getattrInfoDomain(self, _request): if getattr(_request, "name", None) == "security.gov": return MagicMock(res_data=[self.infoDomainNoContact]) elif getattr(_request, "name", None) == "my-nameserver.gov": - if self.extendedValues: + if self.threeNS: return MagicMock(res_data=[self.infoDomainThreeHosts]) elif self.mockedSendFunction.call_count == 5: return MagicMock(res_data=[self.infoDomainTwoHosts]) diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index e78a5a55b..4026eabab 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -859,7 +859,7 @@ class TestRegistrantNameservers(MockEppLib): """ # Mock is set to return 3 nameservers on infodomain - self.extendedValues = True + self.threeNS = True self.domain.nameservers = [(self.nameserver1,), (self.nameserver2,)] expectedCalls = [ # calls info domain, and info on all hosts @@ -900,7 +900,7 @@ class TestRegistrantNameservers(MockEppLib): And `domain.is_active` returns False """ - self.extendedValues = True + self.threeNS = True self.domain.ready() self.domain.nameservers = [(self.nameserver1,)] expectedCalls = [ @@ -952,7 +952,7 @@ class TestRegistrantNameservers(MockEppLib): And `commands.UpdateDomain` is sent to add #4 and #5 plus remove #2 and #3 And `commands.DeleteHost` is sent to delete #2 and #3 """ - self.extendedValues = True + self.threeNS = True self.domain.ready() self.domain.nameservers = [ (self.nameserver1,), @@ -1112,7 +1112,7 @@ class TestRegistrantNameservers(MockEppLib): # sent like this, and then implementing appropriate mocks for any errors the # registry normally sends in this case - self.extendedValues = True + self.threeNS = True # Checking that it doesn't create or update even if out of order self.domain.nameservers = [ @@ -1194,7 +1194,7 @@ class TestRegistrantNameservers(MockEppLib): # print(self.mockedSendFunction.call_args_list) def tearDown(self): - self.extendedValues = False + self.threeNS = False return super().tearDown()