Browse Source

Some syntax and style improvements

pull/321/head
Jörg Runkel 7 years ago
parent
commit
c1911c10a3
2 changed files with 5 additions and 7 deletions
  1. +2
    -4
      octodns/provider/route53.py
  2. +3
    -3
      tests/test_octodns_provider_route53.py

+ 2
- 4
octodns/provider/route53.py View File

@ -546,11 +546,9 @@ class Route53Provider(BaseProvider):
return self._health_checks return self._health_checks
def _healthcheck_measure_latency(self, record): def _healthcheck_measure_latency(self, record):
return (
record._octodns.get('route53', {})
.get('healthcheck', {})
return record._octodns.get('route53', {}) \
.get('healthcheck', {}) \
.get('measure_latency', True) .get('measure_latency', True)
)
def _health_check_equivilent(self, host, path, protocol, port, def _health_check_equivilent(self, host, path, protocol, port,
measure_latency, health_check, measure_latency, health_check,


+ 3
- 3
tests/test_octodns_provider_route53.py View File

@ -885,7 +885,7 @@ class TestRoute53Provider(TestCase):
} }
}) })
measure_latency = provider._healthcheck_measure_latency(record_true) measure_latency = provider._healthcheck_measure_latency(record_true)
self.assertEquals(True, measure_latency)
self.assertTrue(measure_latency)
record_default = Record.new(self.expected, 'a', { record_default = Record.new(self.expected, 'a', {
'ttl': 61, 'ttl': 61,
@ -893,7 +893,7 @@ class TestRoute53Provider(TestCase):
'value': '1.2.3.4', 'value': '1.2.3.4',
}) })
measure_latency = provider._healthcheck_measure_latency(record_default) measure_latency = provider._healthcheck_measure_latency(record_default)
self.assertEquals(True, measure_latency)
self.assertTrue(measure_latency)
record_false = Record.new(self.expected, 'a', { record_false = Record.new(self.expected, 'a', {
'ttl': 61, 'ttl': 61,
@ -910,7 +910,7 @@ class TestRoute53Provider(TestCase):
} }
}) })
measure_latency = provider._healthcheck_measure_latency(record_false) measure_latency = provider._healthcheck_measure_latency(record_false)
self.assertEquals(False, measure_latency)
self.assertFalse(measure_latency)
def test_create_health_checks_measure_latency(self): def test_create_health_checks_measure_latency(self):
provider, stubber = self._get_stubbed_provider() provider, stubber = self._get_stubbed_provider()


Loading…
Cancel
Save