Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Enh/Fix: add a get_free_ports() "enhanced" helper function. #243

Merged
merged 1 commit into from
Sep 13, 2015
Merged

Enh/Fix: add a get_free_ports() "enhanced" helper function. #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions influxdb/tests/misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@

# -*- coding: utf-8 -*-

import socket
import time


def get_free_port(ip='127.0.0.1'):
sock = socket.socket()
def get_free_ports(num_ports, ip='127.0.0.1'):
"""Get `num_ports` free/available ports on the interface linked to the `ip´
:param int num_ports: The number of free ports to get
:param str ip: The ip on which the ports have to be taken
:return: a set of ports number
"""
sock_ports = []
ports = set()
try:
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind((ip, 0))
return sock.getsockname()[1]
for _ in range(num_ports):
sock = socket.socket()
cur = [sock, -1]
# append the socket directly,
# so that it'll be also closed (no leaked resource)
# in the finally here after.
sock_ports.append(cur)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind((ip, 0))
cur[1] = sock.getsockname()[1]
finally:
sock.close()

# Is there a better way than a sleep?
# There were issues on Travis where the port was not yet free.
time.sleep(0.1)
for sock, port in sock_ports:
sock.close()
ports.add(port)
assert num_ports == len(ports)
return ports


def is_port_open(port, ip='127.0.0.1'):
Expand Down
14 changes: 7 additions & 7 deletions influxdb/tests/server_tests/influxdb_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import unittest
import sys

from influxdb.tests.misc import get_free_port, is_port_open
from influxdb.tests.misc import is_port_open, get_free_ports


class InfluxDbInstance(object):
Expand Down Expand Up @@ -54,12 +54,12 @@ def _start_server(self, conf_template, udp_enabled):
dir=self.temp_dir_base)

# find a couple free ports :
ports = dict(
http_port=get_free_port(),
admin_port=get_free_port(),
meta_port=get_free_port(),
udp_port=get_free_port() if udp_enabled else -1,
)
free_ports = get_free_ports(4)
ports = {}
for service in 'http', 'admin', 'meta', 'udp':
ports[service + '_port'] = free_ports.pop()
if not udp_enabled:
ports['udp_port'] = -1

conf_data = dict(
meta_dir=os.path.join(tempdir, 'meta'),
Expand Down