From: Naoki Kambe Date: Mon, 26 Sep 2011 09:35:22 +0000 (+0900) Subject: [1175] remove the two conditions because they do the same tests for IPv4 X-Git-Tag: perftcpdns_before_epoll~117 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34ead9dfeff5f64af36a209cae28075fcbbb3330;p=thirdparty%2Fkea.git [1175] remove the two conditions because they do the same tests for IPv4 whether IPv6 is enabled or not --- diff --git a/src/bin/stats/tests/b10-stats-httpd_test.py b/src/bin/stats/tests/b10-stats-httpd_test.py index 06bf9e6c74..9e03cfa8e0 100644 --- a/src/bin/stats/tests/b10-stats-httpd_test.py +++ b/src/bin/stats/tests/b10-stats-httpd_test.py @@ -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')