Browse Source

Update tests with new per_page params

pull/565/head
Lance Hudson 6 years ago
parent
commit
b80d1575e6
No known key found for this signature in database GPG Key ID: AB2A80D5B4CCA3C8
2 changed files with 10 additions and 6 deletions
  1. +2
    -1
      octodns/provider/cloudflare.py
  2. +8
    -5
      tests/test_octodns_provider_cloudflare.py

+ 2
- 1
octodns/provider/cloudflare.py View File

@ -251,7 +251,8 @@ class CloudflareProvider(BaseProvider):
path = '/zones/{}/dns_records'.format(zone_id) path = '/zones/{}/dns_records'.format(zone_id)
page = 1 page = 1
while page: while page:
resp = self._try_request('GET', path, params={'page': page, 'per_page': 100})
resp = self._try_request('GET', path, params={'page': page,
'per_page': 100})
records += resp['result'] records += resp['result']
info = resp['result_info'] info = resp['result_info']
if info['count'] > 0 and info['count'] == info['per_page']: if info['count'] > 0 and info['count'] == info['per_page']:


+ 8
- 5
tests/test_octodns_provider_cloudflare.py View File

@ -426,7 +426,7 @@ class TestCloudflareProvider(TestCase):
# get the list of zones, create a zone, add some records, update # get the list of zones, create a zone, add some records, update
# something, and delete something # something, and delete something
provider._request.assert_has_calls([ provider._request.assert_has_calls([
call('GET', '/zones', params={'page': 1}),
call('GET', '/zones', params={'page': 1, 'per_page': 50}),
call('POST', '/zones', data={ call('POST', '/zones', data={
'jump_start': False, 'jump_start': False,
'name': 'unit.tests' 'name': 'unit.tests'
@ -531,7 +531,7 @@ class TestCloudflareProvider(TestCase):
# Get zones, create zone, create a record, delete a record # Get zones, create zone, create a record, delete a record
provider._request.assert_has_calls([ provider._request.assert_has_calls([
call('GET', '/zones', params={'page': 1}),
call('GET', '/zones', params={'page': 1, 'per_page': 50}),
call('POST', '/zones', data={ call('POST', '/zones', data={
'jump_start': False, 'jump_start': False,
'name': 'unit.tests' 'name': 'unit.tests'
@ -1302,7 +1302,8 @@ class TestCloudflareProvider(TestCase):
provider._request.side_effect = [result] provider._request.side_effect = [result]
self.assertEquals([], provider.zone_records(zone)) self.assertEquals([], provider.zone_records(zone))
provider._request.assert_has_calls([call('GET', '/zones', provider._request.assert_has_calls([call('GET', '/zones',
params={'page': 1})])
params={'page': 1,
'per_page': 50})])
# One retry required # One retry required
provider._zones = None provider._zones = None
@ -1313,7 +1314,8 @@ class TestCloudflareProvider(TestCase):
] ]
self.assertEquals([], provider.zone_records(zone)) self.assertEquals([], provider.zone_records(zone))
provider._request.assert_has_calls([call('GET', '/zones', provider._request.assert_has_calls([call('GET', '/zones',
params={'page': 1})])
params={'page': 1,
'per_page': 50})])
# Two retries required # Two retries required
provider._zones = None provider._zones = None
@ -1325,7 +1327,8 @@ class TestCloudflareProvider(TestCase):
] ]
self.assertEquals([], provider.zone_records(zone)) self.assertEquals([], provider.zone_records(zone))
provider._request.assert_has_calls([call('GET', '/zones', provider._request.assert_has_calls([call('GET', '/zones',
params={'page': 1})])
params={'page': 1,
'per_page': 50})])
# # Exhaust our retries # # Exhaust our retries
provider._zones = None provider._zones = None


Loading…
Cancel
Save