Corrected handling of ns1 errors, Ns1Provider.populate tests

octodns/provider/ns1.py

@@ -111,11 +111,14 @@ class Ns1Provider(BaseProvider):
 
         try:
             nsone_zone = self._client.loadZone(zone.name[:-1])
-        except ResourceException:
-            return
+            records = nsone_zone.data['records']
+        except ResourceException as e:
+            if e.message != 'server error: zone not found':
+                raise
+            records = []
 
         before = len(zone.records)
-        for record in nsone_zone.data['records']:
+        for record in records:
             _type = record['type']
             data_for = getattr(self, '_data_for_{}'.format(_type))
             name = zone.hostname_from_fqdn(record['domain'])

tests/test_octodns_provider_ns1.py

@@ -0,0 +1,177 @@
+#
+#
+#
+
+from __future__ import absolute_import, division, print_function, \
+    unicode_literals
+
+from mock import patch
+from nsone.rest.errors import AuthException, ResourceException
+from unittest import TestCase
+
+from octodns.record import Record
+from octodns.provider.ns1 import Ns1Provider
+from octodns.zone import Zone
+
+
+class DummyZone(object):
+
+    def __init__(self, records):
+        self.data = {
+            'records': records
+        }
+
+
+class TestNs1Provider(TestCase):
+
+    @patch('nsone.NSONE.loadZone')
+    def test_provider(self, load_mock):
+        provider = Ns1Provider('test', 'api-key')
+
+        # Bad auth
+        load_mock.side_effect = AuthException('unauthorized')
+        zone = Zone('unit.tests.', [])
+        with self.assertRaises(AuthException) as ctx:
+            provider.populate(zone)
+        self.assertEquals(load_mock.side_effect, ctx.exception)
+
+        # General error
+        load_mock.reset_mock()
+        load_mock.side_effect = ResourceException('boom')
+        zone = Zone('unit.tests.', [])
+        with self.assertRaises(ResourceException) as ctx:
+            provider.populate(zone)
+        self.assertEquals(load_mock.side_effect, ctx.exception)
+        self.assertEquals(('unit.tests',), load_mock.call_args[0])
+
+        # Non-existant zone doesn't populate anything
+        load_mock.reset_mock()
+        load_mock.side_effect = \
+            ResourceException('server error: zone not found')
+        zone = Zone('unit.tests.', [])
+        provider.populate(zone)
+        self.assertEquals(set(), zone.records)
+        self.assertEquals(('unit.tests',), load_mock.call_args[0])
+
+        # Existing zone w/o records
+        load_mock.reset_mock()
+        nsone_zone = DummyZone([])
+        load_mock.side_effect = [nsone_zone]
+        zone = Zone('unit.tests.', [])
+        provider.populate(zone)
+        self.assertEquals(set(), zone.records)
+        self.assertEquals(('unit.tests',), load_mock.call_args[0])
+
+        # Existing zone w/records
+        load_mock.reset_mock()
+        nsone_zone = DummyZone([{
+            'type': 'A',
+            'ttl': 32,
+            'short_answers': ['1.2.3.4'],
+            'domain': 'unit.tests.',
+        }, {
+            'type': 'A',
+            'ttl': 33,
+            'short_answers': ['1.2.3.4', '1.2.3.5'],
+            'domain': 'foo.unit.tests.',
+        }, {
+            'type': 'CNAME',
+            'ttl': 34,
+            'short_answers': ['foo.unit.tests.'],
+            'domain': 'cname.unit.tests.',
+        }, {
+            'type': 'MX',
+            'ttl': 35,
+            'short_answers': ['10 mx1.unit.tests.', '20 mx2.unit.tests.'],
+            'domain': 'unit.tests.',
+        }, {
+            'type': 'NAPTR',
+            'ttl': 36,
+            'short_answers': [
+                '10 100 S SIP+D2U !^.*$!sip:info@bar.example.com! .',
+                '100 100 U SIP+D2U !^.*$!sip:info@bar.example.com! .'
+            ],
+            'domain': 'naptr.unit.tests.',
+        }, {
+            'type': 'NS',
+            'ttl': 37,
+            'short_answers': ['ns1.unit.tests.', 'ns2.unit.tests.'],
+            'domain': 'unit.tests.',
+        }, {
+            'type': 'SRV',
+            'ttl': 38,
+            'short_answers': ['12 20 30 foo-2.unit.tests.',
+                              '10 20 30 foo-2.unit.tests.'],
+            'domain': '_srv._tcp.unit.tests.',
+        }])
+        load_mock.side_effect = [nsone_zone]
+        zone = Zone('unit.tests.', [])
+        provider.populate(zone)
+        expected = set()
+        expected.add(Record.new(zone, '', {
+            'ttl': 32,
+            'type': 'A',
+            'value': '1.2.3.4',
+        }))
+        expected.add(Record.new(zone, 'foo', {
+            'ttl': 32,
+            'type': 'A',
+            'values': ['1.2.3.4', '1.2.3.5'],
+        }))
+        expected.add(Record.new(zone, 'cname', {
+            'ttl': 33,
+            'type': 'CNAME',
+            'value': 'foo.unit.tests.',
+        }))
+        expected.add(Record.new(zone, '', {
+            'ttl': 35,
+            'type': 'MX',
+            'values': [{
+                'priority': 10,
+                'value': 'mx1.unit.tests.',
+            }, {
+                'priority': 20,
+                'value': 'mx2.unit.tests.',
+            }]
+        }))
+        expected.add(Record.new(zone, 'naptr', {
+            'ttl': 36,
+            'type': 'NAPTR',
+            'values': [{
+                'flags': 'U',
+                'order': 100,
+                'preference': 100,
+                'regexp': '!^.*$!sip:info@bar.example.com!',
+                'replacement': '.',
+                'service': 'SIP+D2U',
+            }, {
+                'flags': 'S',
+                'order': 10,
+                'preference': 100,
+                'regexp': '!^.*$!sip:info@bar.example.com!',
+                'replacement': '.',
+                'service': 'SIP+D2U',
+            }]
+        }))
+        expected.add(Record.new(zone, '', {
+            'ttl': 37,
+            'type': 'NS',
+            'values': ['ns1.unit.tests.', 'ns2.unit.tests.'],
+        }))
+        expected.add(Record.new(zone, '_srv._tcp', {
+            'ttl': 38,
+            'type': 'SRV',
+            'values': [{
+                'priority': 10,
+                'weight': 20,
+                'port': 30,
+                'target': 'foo-1.unit.tests.',
+            }, {
+                'priority': 12,
+                'weight': 30,
+                'port': 30,
+                'target': 'foo-2.unit.tests.',
+            }]
+        }))
+        self.assertEquals(expected, zone.records)
+        self.assertEquals(('unit.tests',), load_mock.call_args[0])