Browse Source

Configurable domain_create_sleep in EasyDnsProvider, 0s for tests

pull/769/head
Ross McFarland 4 years ago
parent
commit
6354e45d7c
No known key found for this signature in database GPG Key ID: 943B179E15D3B22A
3 changed files with 20 additions and 12 deletions
  1. +10
    -10
      octodns/provider/easydns.py
  2. +6
    -0
      requirements-dev.txt
  3. +4
    -2
      tests/test_octodns_provider_easydns.py

+ 10
- 10
octodns/provider/easydns.py View File

@ -48,19 +48,19 @@ class EasyDNSClient(object):
# Domain Portfolio
domain_portfolio = 'myport'
def __init__(self, token, api_key, currency, portfolio, sandbox):
def __init__(self, token, api_key, currency, portfolio, sandbox,
domain_create_sleep):
self.log = logging.getLogger('EasyDNSProvider[{}]'.format(id))
self.token = token
self.api_key = api_key
self.default_currency = currency
self.domain_portfolio = portfolio
self.apienv = 'sandbox' if sandbox else 'live'
auth_key = '{}:{}'.format(self.token, self.api_key)
self.auth_key = base64.b64encode(auth_key.encode("utf-8"))
self.domain_create_sleep = domain_create_sleep
auth_key = '{}:{}'.format(token, api_key)
auth_key = base64.b64encode(auth_key.encode("utf-8"))
self.base_path = self.SANDBOX if sandbox else self.LIVE
sess = Session()
sess.headers.update({'Authorization': 'Basic {}'
.format(self.auth_key.decode('utf-8'))})
.format(auth_key.decode('utf-8'))})
sess.headers.update({'accept': 'application/json'})
self._sess = sess
@ -99,7 +99,7 @@ class EasyDNSClient(object):
# we need to delete those default record so we can sync with the source
# records, first we'll sleep for a second before gathering new records
# We also create default NS records, but they won't be deleted
sleep(1)
sleep(self.domain_create_sleep)
records = self.records(name, True)
for record in records:
if record['host'] in ('', 'www') \
@ -163,12 +163,12 @@ class EasyDNSProvider(BaseProvider):
'SRV', 'NAPTR'))
def __init__(self, id, token, api_key, currency='CAD', portfolio='myport',
sandbox=False, *args, **kwargs):
sandbox=False, domain_create_sleep=1, *args, **kwargs):
self.log = logging.getLogger('EasyDNSProvider[{}]'.format(id))
self.log.debug('__init__: id=%s, token=***', id)
super(EasyDNSProvider, self).__init__(id, *args, **kwargs)
self._client = EasyDNSClient(token, api_key, currency, portfolio,
sandbox)
sandbox, domain_create_sleep)
self._zone_records = {}
def _data_for_multiple(self, _type, records):


+ 6
- 0
requirements-dev.txt View File

@ -8,3 +8,9 @@ pyflakes==2.2.0
readme_renderer[md]==26.0
requests_mock
twine==3.2.0; python_version >= '3.2'
# Profiling tests...
# nose-cprof
# snakeviz
# ./script/test --with-cprof --cprofile-stats-erase
# snakeviz stats.dat

+ 4
- 2
tests/test_octodns_provider_easydns.py View File

@ -107,7 +107,8 @@ class TestEasyDNSProvider(TestCase):
self.assertEquals('Not Found', text_type(ctx.exception))
def test_apply_not_found(self):
provider = EasyDNSProvider('test', 'token', 'apikey')
provider = EasyDNSProvider('test', 'token', 'apikey',
domain_create_sleep=0)
wanted = Zone('unit.tests.', [])
wanted.add_record(Record.new(wanted, 'test1', {
@ -143,7 +144,8 @@ class TestEasyDNSProvider(TestCase):
self.assertEquals('Not Found', text_type(ctx.exception))
def test_domain_create(self):
provider = EasyDNSProvider('test', 'token', 'apikey')
provider = EasyDNSProvider('test', 'token', 'apikey',
domain_create_sleep=0)
domain_after_creation = {
"tm": 1000000000,
"data": [{


Loading…
Cancel
Save