Dyomedea
/
binder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix-failing-tests' of https://github.com/Dunedan/binder into Dunedan-404-for-not-existing-servers

This commit is contained in:
jeffrey forman 2015-04-04 20:28:31 -04:00
parent a099a43250 a6747b4f25
commit 12654bd3a5
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binder/tests/testHelpers.py
View File

@ -7,7 +7,6 @@ class HelperTests(TestCase):
response = helpers.ip_info("foobar.doesnotexist.local") response = helpers.ip_info("foobar.doesnotexist.local")
self.assertEqual([['Error', u'Unable to resolve foobar.doesnotexist.local: [Errno -2] Name or service not known']], self.assertEqual([['Error', u'Unable to resolve foobar.doesnotexist.local: [Errno -2] Name or service not known']],
response) response)
response = helpers.ip_info("time1.google.com") response = helpers.ip_info("localhost")
self.assertEqual([['IPv4 (1)', u'216.239.32.15'], ['IPv6 (1)', u'2001:4860:4802:32::f']], self.assertEqual([['IPv4 (1)', u'127.0.0.1'], ['IPv6 (1)', u'::1']],
response) sorted(response))

2
binder/tests/testModels.py
View File

@ -15,7 +15,7 @@ class Model_BindServer_Tests(TestCase):
def test_BindServerMissingStatisticsPort(self): def test_BindServerMissingStatisticsPort(self):
"""Attempt to add a BindServer without a statistics port.""" """Attempt to add a BindServer without a statistics port."""
bindserver_1 = models.BindServer(hostname="badtest1") bindserver_1 = models.BindServer(hostname="badtest1")
with self.assertRaisesMessage(IntegrityError, "NOT NULL constraint failed: binder_bindserver.statistics_port"): with self.assertRaises(IntegrityError):
bindserver_1.save() bindserver_1.save()
def test_BindServerNonIntStatisticsPort(self): def test_BindServerNonIntStatisticsPort(self):

3
binder/tests/testViews.py
View File

@ -41,6 +41,9 @@ class PostTests(TestCase):
""" Unit Tests that exercise HTTP POST. """ """ Unit Tests that exercise HTTP POST. """
def setUp(self): def setUp(self):
self.client = Client() self.client = Client()
models.BindServer(hostname="testserver.test.net",
statistics_port=1234).save()
def test_DeleteRecordInitial_Empty(self): def test_DeleteRecordInitial_Empty(self):
""" Ensure the initial deletion form works as expected with no RR list. """ """ Ensure the initial deletion form works as expected with no RR list. """