]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[1175] remove the two conditions because they do the same tests for IPv4
authorNaoki Kambe <kambe@jprs.co.jp>
Mon, 26 Sep 2011 09:35:22 +0000 (18:35 +0900)
committerNaoki Kambe <kambe@jprs.co.jp>
Mon, 3 Oct 2011 02:52:52 +0000 (11:52 +0900)
whether IPv6 is enabled or not

src/bin/stats/tests/b10-stats-httpd_test.py

index 06bf9e6c7406fd059445e4aa069b35f47a71d30a..9e03cfa8e0995f3311bc47385141a1529ab7b9a9 100644 (file)
@@ -390,23 +390,13 @@ class TestStatsHttpd(unittest.TestCase):
                 self.assertEqual(ht.address_family, socket.AF_INET6)
                 self.assertTrue(isinstance(ht.socket, socket.socket))
 
-        # dual stack (address is ipv4)
-        if self.ipv6_enabled:
-            server_addresses = get_availaddr()
-            self.stats_httpd = MyStatsHttpd(server_addresses)
-            for ht in self.stats_httpd.httpd:
-                self.assertTrue(isinstance(ht, stats_httpd.HttpServer))
-                self.assertEqual(ht.address_family, socket.AF_INET)
-                self.assertTrue(isinstance(ht.socket, socket.socket))
-
-        # only-ipv4 single stack
-        if not self.ipv6_enabled:
-            server_addresses = get_availaddr()
-            self.stats_httpd = MyStatsHttpd(server_addresses)
-            for ht in self.stats_httpd.httpd:
-                self.assertTrue(isinstance(ht, stats_httpd.HttpServer))
-                self.assertEqual(ht.address_family, socket.AF_INET)
-                self.assertTrue(isinstance(ht.socket, socket.socket))
+        # dual/single stack (address is ipv4)
+        server_addresses = get_availaddr()
+        self.stats_httpd = MyStatsHttpd(server_addresses)
+        for ht in self.stats_httpd.httpd:
+            self.assertTrue(isinstance(ht, stats_httpd.HttpServer))
+            self.assertEqual(ht.address_family, socket.AF_INET)
+            self.assertTrue(isinstance(ht.socket, socket.socket))
 
         # any address (IPv4)
         server_addresses = get_availaddr(address='0.0.0.0')