@@ -29,7 +29,7 @@ class ipv6_ipv4_tests(BaseTestCase):
2929 PROJECTOR_PORT = "9999"
3030 LOG_PATH = "/opt/couchbase/var/lib/couchbase/logs"
3131 BLOCK_PORTS_FILE_PATH = "pytests/security/block_ports.py"
32-
32+
3333 def _port_map_ (self ):
3434 return IPv6_IPv4 (self .servers ).retrieve_port_map ()
3535
@@ -53,7 +53,7 @@ def tearDown(self):
5353 IPv6_IPv4 (self .servers ).delete_files ()
5454 super (ipv6_ipv4_tests ,self ).tearDown ()
5555
56-
56+
5757 def verify_logs_wrapper (self ,node ,logfile ,query_strs ):
5858 remote_client = RemoteMachineShellConnection (node )
5959 output = remote_client .read_remote_file (self .LOG_PATH , logfile )
@@ -171,9 +171,9 @@ def check_ports_for_service(self,ports,nodes):
171171 # elif self.mode == "ipv4_ipv6":
172172 # self.assertEquals(nodes_obj.check_ports([port],cluster_setting),mappings[0] if cluster_setting=="ipv4" else mappings[1])
173173
174-
174+
175175 #Check for results when ports for other ip family are blocked
176- #eg. for ipv4 family we blocked ports for ipv6 address family
176+ #eg. for ipv4 family we blocked ports for ipv6 address family
177177 def test_services_block_opposite_port (self ):
178178 servs_inout = self .servers [1 :4 ]
179179 services_in = []
@@ -208,8 +208,8 @@ def test_services_block_opposite_port(self):
208208 fts_node = self .get_nodes_from_services_map (service_type = 'fts' )
209209 if fts_node is not None :
210210 self .check_ports_on_blocking_opposite_addr_family (['8094' ], kv_node , "fts" )
211-
212- #Test all services after blocking ports, check for error message format in logs
211+
212+ #Test all services after blocking ports, check for error message format in logs
213213 #Test also takes care with disabling different ip family
214214 def test_services (self ):
215215 servs_inout = self .servers [1 :4 ]
@@ -229,7 +229,7 @@ def test_services(self):
229229 suffix2 = "6"
230230
231231 # Check NS Server Ports
232-
232+
233233 self .log .info ("Checking NS Server Ports" )
234234 self .check_ports_for_service ([self .NSERV_PORT , self .NSERV_SSL_PORT ], self .servers )
235235 query_str1 = "Failed to start dist inet" + suffix2 + "_tcp_dist on port 21100"
@@ -258,7 +258,7 @@ def test_services(self):
258258 self .check_ports_on_blocking ([port ],index_node ,[query_str ],"indexer.log" )
259259 for netw in self .INDEXER_PORTS_NETWORK :
260260 query_str = "Error in listening on network port :{0}" .format (netw )
261- query_str1 = "Indexer exiting normally"
261+ query_str1 = "Indexer exiting normally"
262262 self .check_ports_on_blocking ([netw ],index_node ,[query_str ,query_str1 ],"indexer.log" )
263263 self .sleep (10 )
264264
@@ -300,8 +300,8 @@ def test_services(self):
300300 if fts_node is not None :
301301 self .log .info ("Checking FTS Ports" )
302302 self .check_ports_for_service ([self .FTS_PORT ,self .FTS_SSL_PORT ], [fts_node ])
303- query_str1 = "listen tcp" + suffix2 + " 0.0.0.0:8094: bind: address already in use"
304- query_str2 = "listen tcp" + suffix2 + " :18094: bind: address already in use"
303+ query_str1 = "init_http: listen, err: listen tcp" + suffix1 + " 0.0.0.0:8094: bind: address already in use -- main.mainServeHTTP() at init_http.go:188 "
304+ query_str2 = "init_http: listen, err: listen tcp" + suffix1 + " :18094: bind: address already in use -- main.mainServeHTTP() at init_http.go:188 "
305305 self .check_ports_on_blocking ([self .FTS_PORT ],fts_node ,[query_str1 ],"fts.log" )
306306 self .check_ports_on_blocking ([self .FTS_SSL_PORT ],fts_node ,[query_str2 ],"fts.log" )
307307 self .sleep (10 )
0 commit comments