From ab9ad3e25c6fc313f8aceb78eef42b1d5822dcd6 Mon Sep 17 00:00:00 2001 From: jeffrey forman Date: Sun, 17 Mar 2019 20:45:15 -0400 Subject: [PATCH] statistics_port -> control_port --- binder/tests/testForms.py | 4 ++-- binder/tests/testModels.py | 15 ++++----------- binder/tests/testViews.py | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/binder/tests/testForms.py b/binder/tests/testForms.py index c8b0b29..61112be 100644 --- a/binder/tests/testForms.py +++ b/binder/tests/testForms.py @@ -9,11 +9,11 @@ class Form_Tests(TestCase): def setUp(self): self.ns1_key = Key.objects.create(name='test1', data='testdata1234', algorithm='MD5') self.ns1 = BindServer.objects.create(hostname='ns1.test.net', - statistics_port=8053, + control_port=8053, default_transfer_key=self.ns1_key) self.ns2_key = Key.objects.create(name='test2', data='testdata1234', algorithm='MD5') self.ns2 = BindServer.objects.create(hostname='ns2.test.net', - statistics_port=8053, + control_port=8053, default_transfer_key=self.ns2_key) def test_Valid_FormAddRecordWithoutReverseRecord(self): diff --git a/binder/tests/testModels.py b/binder/tests/testModels.py index 3a8167e..4774a07 100644 --- a/binder/tests/testModels.py +++ b/binder/tests/testModels.py @@ -12,24 +12,17 @@ class Model_BindServer_Tests(TestCase): """Test that adding a well-formed BindServer works.""" self.assertEqual(models.BindServer.objects.count(), 0) bindserver_1 = models.BindServer(hostname="test1", - statistics_port=1234) + control_port=1234) bindserver_1.save() self.assertEqual(models.BindServer.objects.count(), 1) - def test_BindServerMissingStatisticsPort(self): - """Attempt to add a BindServer without a statistics port.""" - bindserver_1 = models.BindServer(hostname="badtest1") - with self.assertRaises(IntegrityError): - bindserver_1.save() - - def test_BindServerNonIntStatisticsPort(self): - """Attempt to add a Bindserver with a non-integer statistics port.""" + def test_BindServerNonIntControlPort(self): + """Attempt to add a Bindserver with a non-integer control port.""" bindserver_1 = models.BindServer(hostname="foo", - statistics_port="bar1") + control_port="bar1") with self.assertRaisesMessage(ValueError, "invalid literal for int() with base 10: 'bar1'"): bindserver_1.save() - class Model_Key_Tests(TestCase): def test_KeyModel(self): """Test that adding a well-formed Key works.""" diff --git a/binder/tests/testViews.py b/binder/tests/testViews.py index 7c6f0f9..44f3448 100644 --- a/binder/tests/testViews.py +++ b/binder/tests/testViews.py @@ -42,7 +42,7 @@ class PostTests(TestCase): def setUp(self): self.client = Client() models.BindServer(hostname="testserver.test.net", - statistics_port=1234).save() + control_port=1234).save() user = User.objects.create_user('testuser', 'testuser@example.com',