From: Lowell Mower <lmower@dyn.com>
Date: Mon, 12 Mar 2018 11:00:09 +0000 (-0400)
Subject: remove unnecessary class attributes
X-Git-Tag: dnsdist-1.3.0~44^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3f4d622f7972adf5b1702dd34bdf7d4d4f60c3f;p=thirdparty%2Fpdns.git

remove unnecessary class attributes
---

diff --git a/regression-tests.dnsdist/test_Carbon.py b/regression-tests.dnsdist/test_Carbon.py
index d25a7d897b..5aa9c72f6a 100644
--- a/regression-tests.dnsdist/test_Carbon.py
+++ b/regression-tests.dnsdist/test_Carbon.py
@@ -7,10 +7,6 @@ from dnsdisttests import DNSDistTest, Queue
 
 class TestCarbon(DNSDistTest):
 
-    _serverCount = 3
-    _serverUpCount = 2
-    _toResponderQueue1 = Queue()
-    _fromResponderQueue1 = Queue()
     _carbonServer1Port = 8000
     _carbonServer1Name = "carbonname1"
     _carbonServer2Port = 8001
@@ -141,13 +137,13 @@ class TestCarbon(DNSDistTest):
                 if 'servers-up' in line:
                     self.assertEquals(len(parts), 3)
                     self.assertTrue(parts[1].isdigit())
-                    self.assertEquals(int(parts[1]), self._serverUpCount)
+                    self.assertEquals(int(parts[1]), 2)
                     self.assertTrue(parts[2].isdigit())
                     self.assertTrue(int(parts[2]) <= int(after))
                 else:
                     self.assertEquals(len(parts), 3)
                     self.assertTrue(parts[1].isdigit())
-                    self.assertEquals(int(parts[1]), self._serverCount)
+                    self.assertEquals(int(parts[1]), 3)
                     self.assertTrue(parts[2].isdigit())
                     self.assertTrue(int(parts[2]) <= int(after))
 
@@ -164,12 +160,12 @@ class TestCarbon(DNSDistTest):
                 if 'servers-up' in line:
                     self.assertEquals(len(parts), 3)
                     self.assertTrue(parts[1].isdigit())
-                    self.assertEquals(int(parts[1]), self._serverUpCount)
+                    self.assertEquals(int(parts[1]), 2)
                     self.assertTrue(parts[2].isdigit())
                     self.assertTrue(int(parts[2]) <= int(after))
                 else:
                     self.assertEquals(len(parts), 3)
                     self.assertTrue(parts[1].isdigit())
-                    self.assertEquals(int(parts[1]), self._serverCount)
+                    self.assertEquals(int(parts[1]), 3)
                     self.assertTrue(parts[2].isdigit())
                     self.assertTrue(int(parts[2]) <= int(after))