mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

Clean up NS1 mock resetting

Browse Source
This commit is contained in:
Ross McFarland
2021-08-23 14:43:38 -07:00
parent 9522da210d
commit 886ab89dec
1 changed files with 70 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

192
tests/test_octodns_provider_ns1.py
View File

@@ -197,8 +197,14 @@ class TestNs1Provider(TestCase):
def test_populate(self, zone_retrieve_mock, record_retrieve_mock): def test_populate(self, zone_retrieve_mock, record_retrieve_mock):
provider = Ns1Provider('test', 'api-key') provider = Ns1Provider('test', 'api-key')
def reset():
provider._client.reset_caches()
zone_retrieve_mock.reset_mock()
record_retrieve_mock.reset_mock()
# Bad auth # Bad auth
provider._client.reset_caches() reset()
zone_retrieve_mock.side_effect = AuthException('unauthorized') zone_retrieve_mock.side_effect = AuthException('unauthorized')
zone = Zone('unit.tests.', []) zone = Zone('unit.tests.', [])
with self.assertRaises(AuthException) as ctx: with self.assertRaises(AuthException) as ctx:
@@ -206,8 +212,7 @@ class TestNs1Provider(TestCase):
self.assertEquals(zone_retrieve_mock.side_effect, ctx.exception) self.assertEquals(zone_retrieve_mock.side_effect, ctx.exception)
# General error # General error
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
zone_retrieve_mock.side_effect = ResourceException('boom') zone_retrieve_mock.side_effect = ResourceException('boom')
zone = Zone('unit.tests.', []) zone = Zone('unit.tests.', [])
with self.assertRaises(ResourceException) as ctx: with self.assertRaises(ResourceException) as ctx:
@@ -216,8 +221,7 @@ class TestNs1Provider(TestCase):
self.assertEquals(('unit.tests',), zone_retrieve_mock.call_args[0]) self.assertEquals(('unit.tests',), zone_retrieve_mock.call_args[0])
# Non-existent zone doesn't populate anything # Non-existent zone doesn't populate anything
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
zone_retrieve_mock.side_effect = \ zone_retrieve_mock.side_effect = \
ResourceException('server error: zone not found') ResourceException('server error: zone not found')
zone = Zone('unit.tests.', []) zone = Zone('unit.tests.', [])
@@ -227,9 +231,7 @@ class TestNs1Provider(TestCase):
self.assertFalse(exists) self.assertFalse(exists)
# Existing zone w/o records # Existing zone w/o records
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
record_retrieve_mock.reset_mock()
ns1_zone = { ns1_zone = {
'records': [{ 'records': [{
"domain": "geo.unit.tests", "domain": "geo.unit.tests",
@@ -259,9 +261,7 @@ class TestNs1Provider(TestCase):
'geo.unit.tests', 'A')]) 'geo.unit.tests', 'A')])
# Existing zone w/records # Existing zone w/records
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
record_retrieve_mock.reset_mock()
ns1_zone = { ns1_zone = {
'records': self.ns1_records + [{ 'records': self.ns1_records + [{
"domain": "geo.unit.tests", "domain": "geo.unit.tests",
@@ -291,9 +291,7 @@ class TestNs1Provider(TestCase):
'geo.unit.tests', 'A')]) 'geo.unit.tests', 'A')])
# Test skipping unsupported record type # Test skipping unsupported record type
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
record_retrieve_mock.reset_mock()
ns1_zone = { ns1_zone = {
'records': self.ns1_records + [{ 'records': self.ns1_records + [{
'type': 'UNSUPPORTED', 'type': 'UNSUPPORTED',
@@ -346,21 +344,21 @@ class TestNs1Provider(TestCase):
self.assertEquals(expected_n, len(plan.changes)) self.assertEquals(expected_n, len(plan.changes))
self.assertTrue(plan.exists) self.assertTrue(plan.exists)
def reset():
provider._client.reset_caches()
record_retrieve_mock.reset_mock()
zone_create_mock.reset_mock()
zone_retrieve_mock.reset_mock()
# Fails, general error # Fails, general error
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
record_retrieve_mock.reset_mock()
zone_create_mock.reset_mock()
zone_retrieve_mock.side_effect = ResourceException('boom') zone_retrieve_mock.side_effect = ResourceException('boom')
with self.assertRaises(ResourceException) as ctx: with self.assertRaises(ResourceException) as ctx:
provider.apply(plan) provider.apply(plan)
self.assertEquals(zone_retrieve_mock.side_effect, ctx.exception) self.assertEquals(zone_retrieve_mock.side_effect, ctx.exception)
# Fails, bad auth # Fails, bad auth
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
record_retrieve_mock.reset_mock()
zone_create_mock.reset_mock()
zone_retrieve_mock.side_effect = \ zone_retrieve_mock.side_effect = \
ResourceException('server error: zone not found') ResourceException('server error: zone not found')
zone_create_mock.side_effect = AuthException('unauthorized') zone_create_mock.side_effect = AuthException('unauthorized')
@@ -369,10 +367,7 @@ class TestNs1Provider(TestCase):
self.assertEquals(zone_create_mock.side_effect, ctx.exception) self.assertEquals(zone_create_mock.side_effect, ctx.exception)
# non-existent zone, create # non-existent zone, create
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
record_retrieve_mock.reset_mock()
zone_create_mock.reset_mock()
zone_retrieve_mock.side_effect = \ zone_retrieve_mock.side_effect = \
ResourceException('server error: zone not found') ResourceException('server error: zone not found')
@@ -404,10 +399,7 @@ class TestNs1Provider(TestCase):
]) ])
# Update & delete # Update & delete
provider._client.reset_caches() reset()
zone_retrieve_mock.reset_mock()
record_retrieve_mock.reset_mock()
zone_create_mock.reset_mock()
ns1_zone = { ns1_zone = {
'records': self.ns1_records + [{ 'records': self.ns1_records + [{
@@ -947,11 +939,14 @@ class TestNs1ProviderDynamic(TestCase):
'mon-id': 'feed-id', 'mon-id': 'feed-id',
} }
def reset():
feed_create_mock.reset_mock()
monitor_create_mock.reset_mock()
monitor_gen_mock.reset_mock()
monitors_update_mock.reset_mock()
# No existing monitor # No existing monitor
monitor_gen_mock.reset_mock() reset()
monitor_create_mock.reset_mock()
monitors_update_mock.reset_mock()
feed_create_mock.reset_mock()
monitor_gen_mock.side_effect = [{'key': 'value'}] monitor_gen_mock.side_effect = [{'key': 'value'}]
monitor_create_mock.side_effect = [('mon-id', 'feed-id')] monitor_create_mock.side_effect = [('mon-id', 'feed-id')]
value = '1.2.3.4' value = '1.2.3.4'
@@ -965,10 +960,7 @@ class TestNs1ProviderDynamic(TestCase):
feed_create_mock.assert_not_called() feed_create_mock.assert_not_called()
# Existing monitor that doesn't need updates # Existing monitor that doesn't need updates
monitor_gen_mock.reset_mock() reset()
monitor_create_mock.reset_mock()
monitors_update_mock.reset_mock()
feed_create_mock.reset_mock()
monitor = { monitor = {
'id': 'mon-id', 'id': 'mon-id',
'key': 'value', 'key': 'value',
@@ -985,10 +977,7 @@ class TestNs1ProviderDynamic(TestCase):
feed_create_mock.assert_not_called() feed_create_mock.assert_not_called()
# Existing monitor that doesn't need updates, but is missing its feed # Existing monitor that doesn't need updates, but is missing its feed
monitor_gen_mock.reset_mock() reset()
monitor_create_mock.reset_mock()
monitors_update_mock.reset_mock()
feed_create_mock.reset_mock()
monitor = { monitor = {
'id': 'mon-id2', 'id': 'mon-id2',
'key': 'value', 'key': 'value',
@@ -1006,10 +995,7 @@ class TestNs1ProviderDynamic(TestCase):
feed_create_mock.assert_has_calls([call(monitor)]) feed_create_mock.assert_has_calls([call(monitor)])
# Existing monitor that needs updates # Existing monitor that needs updates
monitor_gen_mock.reset_mock() reset()
monitor_create_mock.reset_mock()
monitors_update_mock.reset_mock()
feed_create_mock.reset_mock()
monitor = { monitor = {
'id': 'mon-id', 'id': 'mon-id',
'key': 'value', 'key': 'value',
@@ -1043,11 +1029,14 @@ class TestNs1ProviderDynamic(TestCase):
'mon-id': 'feed-id', 'mon-id': 'feed-id',
} }
def reset():
datafeed_delete_mock.reset_mock()
monitors_delete_mock.reset_mock()
monitors_for_mock.reset_mock()
notifylists_delete_mock.reset_mock()
# No active monitors and no existing, nothing will happen # No active monitors and no existing, nothing will happen
monitors_for_mock.reset_mock() reset()
datafeed_delete_mock.reset_mock()
monitors_delete_mock.reset_mock()
notifylists_delete_mock.reset_mock()
monitors_for_mock.side_effect = [{}] monitors_for_mock.side_effect = [{}]
record = self.record() record = self.record()
provider._monitors_gc(record) provider._monitors_gc(record)
@@ -1057,10 +1046,7 @@ class TestNs1ProviderDynamic(TestCase):
notifylists_delete_mock.assert_not_called() notifylists_delete_mock.assert_not_called()
# No active monitors and one existing, delete all the things # No active monitors and one existing, delete all the things
monitors_for_mock.reset_mock() reset()
datafeed_delete_mock.reset_mock()
monitors_delete_mock.reset_mock()
notifylists_delete_mock.reset_mock()
monitors_for_mock.side_effect = [{ monitors_for_mock.side_effect = [{
'x': { 'x': {
'id': 'mon-id', 'id': 'mon-id',
@@ -1080,10 +1066,7 @@ class TestNs1ProviderDynamic(TestCase):
notifylists_delete_mock.assert_has_calls([call('nl-id')]) notifylists_delete_mock.assert_has_calls([call('nl-id')])
# Same existing, this time in active list, should be noop # Same existing, this time in active list, should be noop
monitors_for_mock.reset_mock() reset()
datafeed_delete_mock.reset_mock()
monitors_delete_mock.reset_mock()
notifylists_delete_mock.reset_mock()
monitors_for_mock.side_effect = [{ monitors_for_mock.side_effect = [{
'x': { 'x': {
'id': 'mon-id', 'id': 'mon-id',
@@ -1098,10 +1081,7 @@ class TestNs1ProviderDynamic(TestCase):
# Non-active monitor w/o a feed, and another monitor that's left alone # Non-active monitor w/o a feed, and another monitor that's left alone
# b/c it's active # b/c it's active
monitors_for_mock.reset_mock() reset()
datafeed_delete_mock.reset_mock()
monitors_delete_mock.reset_mock()
notifylists_delete_mock.reset_mock()
monitors_for_mock.side_effect = [{ monitors_for_mock.side_effect = [{
'x': { 'x': {
'id': 'mon-id', 'id': 'mon-id',
@@ -1130,10 +1110,7 @@ class TestNs1ProviderDynamic(TestCase):
# Non-active monitor w/o a notifylist, generally shouldn't happen, but # Non-active monitor w/o a notifylist, generally shouldn't happen, but
# code should handle it just in case someone gets clicky in the UI # code should handle it just in case someone gets clicky in the UI
monitors_for_mock.reset_mock() reset()
datafeed_delete_mock.reset_mock()
monitors_delete_mock.reset_mock()
notifylists_delete_mock.reset_mock()
monitors_for_mock.side_effect = [{ monitors_for_mock.side_effect = [{
'y': { 'y': {
'id': 'mon-id2', 'id': 'mon-id2',
@@ -1158,11 +1135,8 @@ class TestNs1ProviderDynamic(TestCase):
# Non-active monitor with a shared notifylist, monitor deleted, but # Non-active monitor with a shared notifylist, monitor deleted, but
# notifylist is left alone # notifylist is left alone
reset()
provider.shared_notifylist = True provider.shared_notifylist = True
monitors_for_mock.reset_mock()
datafeed_delete_mock.reset_mock()
monitors_delete_mock.reset_mock()
notifylists_delete_mock.reset_mock()
monitors_for_mock.side_effect = [{ monitors_for_mock.side_effect = [{
'y': { 'y': {
'id': 'mon-id2', 'id': 'mon-id2',
@@ -1945,37 +1919,35 @@ class TestNs1ProviderDynamic(TestCase):
desired = Zone('unit.tests.', []) desired = Zone('unit.tests.', [])
def reset():
monitors_for_mock.reset_mock()
provider._client.reset_caches()
records_retrieve_mock.reset_mock()
zones_retrieve_mock.reset_mock()
# Empty zone and no changes # Empty zone and no changes
monitors_for_mock.reset_mock() reset()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
extra = provider._extra_changes(desired, []) extra = provider._extra_changes(desired, [])
self.assertFalse(extra) self.assertFalse(extra)
monitors_for_mock.assert_not_called() monitors_for_mock.assert_not_called()
# Non-existent zone. No changes # Non-existent zone. No changes
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.side_effect = \ zones_retrieve_mock.side_effect = \
ResourceException('server error: zone not found') ResourceException('server error: zone not found')
records_retrieve_mock.reset_mock()
extra = provider._extra_changes(desired, []) extra = provider._extra_changes(desired, [])
self.assertFalse(extra) self.assertFalse(extra)
# Unexpected exception message # Unexpected exception message
provider._client.reset_caches() reset()
zones_retrieve_mock.reset_mock()
zones_retrieve_mock.side_effect = ResourceException('boom') zones_retrieve_mock.side_effect = ResourceException('boom')
with self.assertRaises(ResourceException) as ctx: with self.assertRaises(ResourceException) as ctx:
extra = provider._extra_changes(desired, []) extra = provider._extra_changes(desired, [])
self.assertEquals(zones_retrieve_mock.side_effect, ctx.exception) self.assertEquals(zones_retrieve_mock.side_effect, ctx.exception)
# Simple record, ignored, filter update lookups ignored # Simple record, ignored, filter update lookups ignored
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
zones_retrieve_mock.side_effect = \ zones_retrieve_mock.side_effect = \
ResourceException('server error: zone not found') ResourceException('server error: zone not found')
@@ -2020,10 +1992,7 @@ class TestNs1ProviderDynamic(TestCase):
desired.add_record(dynamic) desired.add_record(dynamic)
# untouched, but everything in sync so no change needed # untouched, but everything in sync so no change needed
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
# Generate what we expect to have # Generate what we expect to have
gend = provider._monitor_gen(dynamic, '1.2.3.4') gend = provider._monitor_gen(dynamic, '1.2.3.4')
gend.update({ gend.update({
@@ -2041,10 +2010,7 @@ class TestNs1ProviderDynamic(TestCase):
# If we don't have a notify list we're broken and we'll expect to see # If we don't have a notify list we're broken and we'll expect to see
# an Update # an Update
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
del gend['notify_list'] del gend['notify_list']
monitors_for_mock.side_effect = [{ monitors_for_mock.side_effect = [{
'1.2.3.4': gend, '1.2.3.4': gend,
@@ -2058,10 +2024,7 @@ class TestNs1ProviderDynamic(TestCase):
# Add notify_list back and change the healthcheck protocol, we'll still # Add notify_list back and change the healthcheck protocol, we'll still
# expect to see an update # expect to see an update
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
gend['notify_list'] = 'xyz' gend['notify_list'] = 'xyz'
dynamic._octodns['healthcheck']['protocol'] = 'HTTPS' dynamic._octodns['healthcheck']['protocol'] = 'HTTPS'
del gend['notify_list'] del gend['notify_list']
@@ -2076,10 +2039,7 @@ class TestNs1ProviderDynamic(TestCase):
monitors_for_mock.assert_has_calls([call(dynamic)]) monitors_for_mock.assert_has_calls([call(dynamic)])
# If it's in the changed list, it'll be ignored # If it's in the changed list, it'll be ignored
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
extra = provider._extra_changes(desired, [update]) extra = provider._extra_changes(desired, [update])
self.assertFalse(extra) self.assertFalse(extra)
monitors_for_mock.assert_not_called() monitors_for_mock.assert_not_called()
@@ -2087,10 +2047,7 @@ class TestNs1ProviderDynamic(TestCase):
# Test changes in filters # Test changes in filters
# No change in filters # No change in filters
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
ns1_zone = { ns1_zone = {
'records': [{ 'records': [{
"domain": "dyn.unit.tests", "domain": "dyn.unit.tests",
@@ -2107,10 +2064,7 @@ class TestNs1ProviderDynamic(TestCase):
self.assertFalse(extra) self.assertFalse(extra)
# filters need an update # filters need an update
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
ns1_zone = { ns1_zone = {
'records': [{ 'records': [{
"domain": "dyn.unit.tests", "domain": "dyn.unit.tests",
@@ -2127,10 +2081,7 @@ class TestNs1ProviderDynamic(TestCase):
self.assertTrue(extra) self.assertTrue(extra)
# Mixed disabled in filters. Raise Ns1Exception # Mixed disabled in filters. Raise Ns1Exception
provider._client.reset_caches() reset()
monitors_for_mock.reset_mock()
zones_retrieve_mock.reset_mock()
records_retrieve_mock.reset_mock()
ns1_zone = { ns1_zone = {
'records': [{ 'records': [{
"domain": "dyn.unit.tests", "domain": "dyn.unit.tests",
@@ -2494,9 +2445,12 @@ class TestNs1Client(TestCase):
notifylists_delete_mock): notifylists_delete_mock):
client = Ns1Client('dummy-key') client = Ns1Client('dummy-key')
notifylists_list_mock.reset_mock() def reset():
notifylists_create_mock.reset_mock() notifylists_create_mock.reset_mock()
notifylists_delete_mock.reset_mock() notifylists_delete_mock.reset_mock()
notifylists_list_mock.reset_mock()
reset()
notifylists_list_mock.side_effect = [{}] notifylists_list_mock.side_effect = [{}]
expected = { expected = {
'id': 'nl-id', 'id': 'nl-id',
@@ -2518,9 +2472,7 @@ class TestNs1Client(TestCase):
]) ])
notifylists_delete_mock.assert_not_called() notifylists_delete_mock.assert_not_called()
notifylists_list_mock.reset_mock() reset()
notifylists_create_mock.reset_mock()
notifylists_delete_mock.reset_mock()
client.notifylists_delete('nlid') client.notifylists_delete('nlid')
notifylists_list_mock.assert_not_called() notifylists_list_mock.assert_not_called()
notifylists_create_mock.assert_not_called() notifylists_create_mock.assert_not_called()
@@ -2528,9 +2480,7 @@ class TestNs1Client(TestCase):
# Delete again, this time with a cache item that needs cleaned out and # Delete again, this time with a cache item that needs cleaned out and
# another that needs to be ignored # another that needs to be ignored
notifylists_list_mock.reset_mock() reset()
notifylists_create_mock.reset_mock()
notifylists_delete_mock.reset_mock()
client._notifylists_cache = { client._notifylists_cache = {
'another': { 'another': {
'id': 'notid', 'id': 'notid',
@@ -2549,9 +2499,7 @@ class TestNs1Client(TestCase):
# Only another left # Only another left
self.assertEquals(['another'], list(client._notifylists_cache.keys())) self.assertEquals(['another'], list(client._notifylists_cache.keys()))
notifylists_list_mock.reset_mock() reset()
notifylists_create_mock.reset_mock()
notifylists_delete_mock.reset_mock()
expected = ['one', 'two', 'three'] expected = ['one', 'two', 'three']
notifylists_list_mock.side_effect = [expected] notifylists_list_mock.side_effect = [expected]
nls = client.notifylists_list() nls = client.notifylists_list()