Eliminate find_port() and check_port() functions

Now these functions are not needed anymore due to added free port auto
resolving mechanism.

Closes #141

Author: ylobankov

lib/utils.py

@@ -3,13 +3,11 @@
 import sys
 import collections
 import signal
-import random
 import fcntl
 import difflib
 import time
 import json
 import subprocess
-from gevent import socket
 from lib.colorer import color_stdout
 
 try:
@@ -85,63 +83,6 @@ def print_tail_n(filename, num_lines=None):
             color_stdout(line, schema='tail')
 
 
-def check_port(port, rais=True, ipv4=True, ipv6=True):
-    """ True -- it's possible to listen on this port for TCP/IPv4 or TCP/IPv6
-    connections (UNIX Sockets in case of file path). False -- otherwise.
-    """
-    try:
-        if isinstance(port, integer_types):
-            if ipv4:
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.bind(('127.0.0.1', port))
-                sock.listen(5)
-                sock.close()
-            if ipv6:
-                sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-                sock.bind(('::1', port))
-                sock.listen(5)
-                sock.close()
-        else:
-            sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            sock.connect(port)
-    except socket.error:
-        if rais:
-            raise RuntimeError(
-                "The server is already running on port {0}".format(port))
-        return False
-    return True
-
-
-# A list of ports used so far. Avoid reusing ports
-# to reduce race conditions between starting and stopping servers.
-# We're using tarantoolctl for instance control, and it reports
-# a successful stop of the server before it really closes its
-# network sockets
-ports = {}
-
-
-is_ipv6_supported = check_port(port=0, rais=False, ipv4=False, ipv6=True)
-
-
-def find_port():
-    global ports
-    start_port = int(os.environ.get('TEST_RUN_TCP_PORT_START', '3000'))
-    end_port = int(os.environ.get('TEST_RUN_TCP_PORT_END', '65535'))
-    port = random.randrange(start_port, end_port + 1)
-
-    while port <= end_port:
-        is_free = check_port(port, False, ipv4=True, ipv6=is_ipv6_supported)
-        if port not in ports and is_free:
-            ports[port] = True
-            return port
-        port += 1
-
-    # We've made a full circle, clear the list of used ports and start
-    # from scratch
-    ports = {}
-    return find_port()
-
-
 def find_in_path(name):
     path = os.curdir + os.pathsep + os.environ["PATH"]
     for _dir in path.split(os.pathsep):

test/unittest/test_lib_utils.py

@@ -1,32 +1,14 @@
-import socket
 import unittest
 
-from hypothesis import given, settings
-from hypothesis.strategies import integers
-
 import lib.utils as utils
 
+
 class TestUtils(unittest.TestCase):
     def test_extract_schema_from_snapshot(self):
         snapshot_path = 'test/unittest/00000000000000000003.snap'
         v = utils.extract_schema_from_snapshot(snapshot_path)
         self.assertEqual(v, (2, 3, 1))
 
-    @settings(max_examples=5)
-    @given(port=integers(65100, 65535))
-    def test_check_port(self, port):
-        def open_socket(p):
-            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            s.bind(('localhost', p))
-            s.listen(0)
-            return s
-        status = utils.check_port(port, rais=False, ipv4=True, ipv6=False)
-        self.assertEqual(status, True)
-        s = open_socket(port)
-        status = utils.check_port(port, rais=False, ipv4=True, ipv6=False)
-        s.close()
-        self.assertEqual(status, False)
-
 
 if __name__ == "__main__":
     unittest.main()