Browse Source

[1175] remove the two conditions because they do the same tests for IPv4
whether IPv6 is enabled or not

Naoki Kambe 13 years ago
parent
commit
34ead9dfef
1 changed files with 7 additions and 17 deletions
  1. 7 17
      src/bin/stats/tests/b10-stats-httpd_test.py

+ 7 - 17
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')