diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 3c0d7d0c4..9d3e3aab8 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -478,7 +478,7 @@ class Domain(TimeStampedModel, DomainHelper): } print("\nCACHE AT TOP\n\n"+str(cache)+"\n\n\n") # remove null properties (to distinguish between "a value of None" and null) - cleaned = {k: v for k, v in cache if v is not ...} + cleaned = {k: v for k, v in cache.items() if v is not ...} print("\ncleaned is "+str(cleaned)+"\n\n") # get contact info, if there are any if ( diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index 5fb3ac999..983eed5f5 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -13,15 +13,19 @@ try: from epplib import InfoDomain except ImportError: # allow epplibwrapper to load without epplib, for testing and development + print("epplib didn't load") pass ##delete me from django.core.cache import cache class TestDomain(TestCase): - mockDataInfoDomain={"avail": False, - "auth_info": None, - "cr_date": datetime.datetime(2023, 5, 25, 19, 45, 35) - } + class fakedEppObject(object): + def __init__(self, avail, auth_info, cr_date): + self.avail=avail + self.auth_info=auth_info + self.cr_date=cr_date + + mockDataInfoDomain=fakedEppObject(False, None, datetime.datetime(2023, 5, 25, 19, 45, 35)) # {'auth_info': , '_contacts': , 'cr_date': , 'ex_date': , '_hosts': , 'name': , 'registrant': , 'statuses': , 'tr_date': , 'up_date': } # mockDataContactInfo={ @@ -71,15 +75,21 @@ class TestDomain(TestCase): # print(patch) # domain, _= Domain.objects.get_or_create(name="igorville.gov") # mockSend=MagicMock(return_val) - + # InfoDomain() with patch ("registrar.models.domain.registry.send", new=self.mock_send): # with patch("epplibwrapper.CLIENT") as registry_mock, \ # patch("epplibwrapper.CLIENT.send",side_effects=self.mock_send) as send_mock: # with patch("epplibwrapper.CLIENT.send",side_effects=self.mock_send): domain, _ = Domain.objects.get_or_create(name="igorville.gov") - domain._get_property("auth_info") + domain._get_property("auth_info") + # domain._get_property("cr_date") print(domain._cache) + self.assertEquals(domain._cache["auth_info"],self.mockDataInfoDomain.auth_info ) + self.assertEquals(domain._cache["cr_date"],self.mockDataInfoDomain.cr_date ) + self.assertFalse("avail" in domain._cache.keys()) + + #check it a second time and make sure send is not called # sec=domain.security_contact # print(sec) # print("domain cache is as follows\n")