mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-18 18:39:21 +02:00
Linter
This commit is contained in:
zandercymatics
parent
c2cc19ee1a
commit
9a12e29c5a
6 changed files with 66 additions and 73 deletions
|
|
@ -166,13 +166,9 @@ class EPPLibWrapper:
|
|||
|
||||
def _create_pool(self, client, login, options):
|
||||
"""Creates and returns new pool instance"""
|
||||
return EPPConnectionPool(
|
||||
client, login, options
|
||||
)
|
||||
return EPPConnectionPool(client, login, options)
|
||||
|
||||
def start_connection_pool(
|
||||
self, restart_pool_if_exists=True
|
||||
):
|
||||
def start_connection_pool(self, restart_pool_if_exists=True):
|
||||
"""Starts a connection pool for the registry.
|
||||
|
||||
restart_pool_if_exists -> bool:
|
||||
|
|
@ -199,9 +195,7 @@ class EPPLibWrapper:
|
|||
logger.info("Connection pool restarting...")
|
||||
self.kill_pool()
|
||||
|
||||
self._pool = self._create_pool(
|
||||
self._client, self._login, self.pool_options
|
||||
)
|
||||
self._pool = self._create_pool(self._client, self._login, self.pool_options)
|
||||
|
||||
self.pool_status.pool_running = True
|
||||
self.pool_status.pool_hanging = False
|
||||
|
|
|
|||
|
|
@ -59,8 +59,6 @@ class Socket:
|
|||
counter += 1
|
||||
sleep((counter * 50) / 1000) # sleep 50 ms to 150 ms
|
||||
else: # don't try again
|
||||
logger.warning("LoginError raised and should not retry or has been retried 3 times already")
|
||||
logger.warning(f"should retry? {err.should_retry()}")
|
||||
return False
|
||||
else:
|
||||
self.disconnect()
|
||||
|
|
|
|||
|
|
@ -1,15 +1,11 @@
|
|||
import datetime
|
||||
from pathlib import Path
|
||||
from unittest import skip
|
||||
from unittest.mock import MagicMock, patch
|
||||
from dateutil.tz import tzlocal
|
||||
from django.conf import settings
|
||||
|
||||
from django.test import TestCase
|
||||
from epplibwrapper.client import EPPLibWrapper
|
||||
from epplibwrapper.socket import Socket
|
||||
from epplibwrapper.utility.pool import EPPConnectionPool
|
||||
from registrar.models.domain import Domain
|
||||
from registrar.models.domain import registry
|
||||
from contextlib import ExitStack
|
||||
|
||||
|
|
@ -58,53 +54,55 @@ class TestConnectionPool(TestCase):
|
|||
return True
|
||||
|
||||
def fake_send(self, command, cleaned=None):
|
||||
mock = MagicMock(
|
||||
code=1000,
|
||||
msg="Command completed successfully",
|
||||
res_data=None,
|
||||
cl_tr_id="xkw1uo#2023-10-17T15:29:09.559376",
|
||||
sv_tr_id="5CcH4gxISuGkq8eqvr1UyQ==-35a",
|
||||
extensions=[],
|
||||
msg_q=None,
|
||||
)
|
||||
return mock
|
||||
mock = MagicMock(
|
||||
code=1000,
|
||||
msg="Command completed successfully",
|
||||
res_data=None,
|
||||
cl_tr_id="xkw1uo#2023-10-17T15:29:09.559376",
|
||||
sv_tr_id="5CcH4gxISuGkq8eqvr1UyQ==-35a",
|
||||
extensions=[],
|
||||
msg_q=None,
|
||||
)
|
||||
return mock
|
||||
|
||||
@patch.object(EPPLibWrapper, "_test_registry_connection_success", patch_success)
|
||||
def test_pool_sends_data(self):
|
||||
"""A .send is invoked on the pool successfully"""
|
||||
expected_result = {
|
||||
'cl_tr_id': None,
|
||||
'code': 1000,
|
||||
'extensions': [],
|
||||
'msg': 'Command completed successfully',
|
||||
'msg_q': None,
|
||||
'res_data': [info.InfoDomainResultData(
|
||||
roid='DF1340360-GOV',
|
||||
statuses=[
|
||||
common.Status(
|
||||
state='serverTransferProhibited',
|
||||
description=None,
|
||||
lang='en'
|
||||
),
|
||||
common.Status(state='inactive',
|
||||
description=None,
|
||||
lang='en')],
|
||||
cl_id='gov2023-ote',
|
||||
cr_id='gov2023-ote',
|
||||
cr_date=datetime.datetime(2023, 8, 15, 23, 56, 36, tzinfo=tzlocal()),
|
||||
up_id='gov2023-ote',
|
||||
up_date=datetime.datetime(2023, 8, 17, 2, 3, 19, tzinfo=tzlocal()),
|
||||
tr_date=None,
|
||||
name='test3.gov',
|
||||
registrant='TuaWnx9hnm84GCSU',
|
||||
admins=[],
|
||||
nsset=None,
|
||||
keyset=None,
|
||||
ex_date=datetime.date(2024, 8, 15),
|
||||
auth_info=info.DomainAuthInfo(pw='2fooBAR123fooBaz')
|
||||
)
|
||||
],
|
||||
'sv_tr_id': 'wRRNVhKhQW2m6wsUHbo/lA==-29a'
|
||||
"cl_tr_id": None,
|
||||
"code": 1000,
|
||||
"extensions": [],
|
||||
"msg": "Command completed successfully",
|
||||
"msg_q": None,
|
||||
"res_data": [
|
||||
info.InfoDomainResultData(
|
||||
roid="DF1340360-GOV",
|
||||
statuses=[
|
||||
common.Status(
|
||||
state="serverTransferProhibited",
|
||||
description=None,
|
||||
lang="en",
|
||||
),
|
||||
common.Status(state="inactive", description=None, lang="en"),
|
||||
],
|
||||
cl_id="gov2023-ote",
|
||||
cr_id="gov2023-ote",
|
||||
cr_date=datetime.datetime(
|
||||
2023, 8, 15, 23, 56, 36, tzinfo=tzlocal()
|
||||
),
|
||||
up_id="gov2023-ote",
|
||||
up_date=datetime.datetime(2023, 8, 17, 2, 3, 19, tzinfo=tzlocal()),
|
||||
tr_date=None,
|
||||
name="test3.gov",
|
||||
registrant="TuaWnx9hnm84GCSU",
|
||||
admins=[],
|
||||
nsset=None,
|
||||
keyset=None,
|
||||
ex_date=datetime.date(2024, 8, 15),
|
||||
auth_info=info.DomainAuthInfo(pw="2fooBAR123fooBaz"),
|
||||
)
|
||||
],
|
||||
"sv_tr_id": "wRRNVhKhQW2m6wsUHbo/lA==-29a",
|
||||
}
|
||||
|
||||
def fake_client(mock_client):
|
||||
|
|
@ -120,13 +118,15 @@ class TestConnectionPool(TestCase):
|
|||
|
||||
# Mock a response from EPP
|
||||
def fake_receive(command, cleaned=None):
|
||||
location= Path(__file__).parent / "utility" / "infoDomain.xml"
|
||||
location = Path(__file__).parent / "utility" / "infoDomain.xml"
|
||||
xml = (location).read_bytes()
|
||||
return xml
|
||||
|
||||
# Mock what happens inside the "with"
|
||||
with ExitStack() as stack:
|
||||
stack.enter_context(patch.object(EPPConnectionPool, "_create_socket", self.fake_socket))
|
||||
stack.enter_context(
|
||||
patch.object(EPPConnectionPool, "_create_socket", self.fake_socket)
|
||||
)
|
||||
stack.enter_context(patch.object(Socket, "connect", fake_client))
|
||||
stack.enter_context(patch.object(SocketTransport, "send", self.fake_send))
|
||||
stack.enter_context(patch.object(SocketTransport, "receive", fake_receive))
|
||||
|
|
@ -152,6 +152,7 @@ class TestConnectionPool(TestCase):
|
|||
def test_raises_transport_error(self):
|
||||
"""A .send is invoked on the pool, but registry connection is lost
|
||||
right as we send a command."""
|
||||
|
||||
# Fake data for the _pool object
|
||||
def fake_client(self):
|
||||
client = Client(
|
||||
|
|
@ -165,7 +166,9 @@ class TestConnectionPool(TestCase):
|
|||
return client
|
||||
|
||||
with ExitStack() as stack:
|
||||
stack.enter_context(patch.object(EPPConnectionPool, "_create_socket", self.fake_socket))
|
||||
stack.enter_context(
|
||||
patch.object(EPPConnectionPool, "_create_socket", self.fake_socket)
|
||||
)
|
||||
stack.enter_context(patch.object(Socket, "connect", fake_client))
|
||||
# Restart the connection pool, since it starts on app startup
|
||||
registry.start_connection_pool()
|
||||
|
|
@ -176,5 +179,3 @@ class TestConnectionPool(TestCase):
|
|||
# Try to send a command out - should fail
|
||||
with self.assertRaises(TransportError):
|
||||
registry.send(commands.InfoDomain(name="test.gov"), cleaned=True)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
import logging
|
||||
import greenlet
|
||||
import gevent
|
||||
from geventconnpool import ConnectionPool
|
||||
from epplibwrapper.socket import Socket
|
||||
from epplibwrapper.utility.pool_error import PoolError, PoolErrorCodes
|
||||
|
||||
try:
|
||||
from epplib.commands import Hello
|
||||
except ImportError:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue