fix: fix circleci port bug

Author: altor

.gitignore

@@ -1,2 +1,154 @@
-# created by virtualenv automatically
-*
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Sphinx documentation
+docs/_build/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+### Emacs ###
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el
+
+# network security
+/network-security.data
+
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+### IntelliJ IDEA ###
+.idea/

powerapi/database/socket_db.py

@@ -49,7 +49,7 @@ def __init__(self, port):
     async def connect(self):
         self.queue = asyncio.Queue()
         # self.queue = Queue()
-        self.server = await asyncio.start_server(self.gen_server_callback(), host='localhost', port=self.port)
+        self.server = await asyncio.start_server(self.gen_server_callback(), host='127.0.0.1', port=self.port)
 
     async def stop(self):
         self.server.close()

tests/acceptation/test_simple_architecture_socket_db.py

@@ -75,7 +75,6 @@
 from tests.mongo_utils import clean_base_db_test
 
 DB_URI = "mongodb://localhost:27017/"
-PORT = random.randint(1000, 60000)
 LOG_LEVEL = logging.NOTSET
 
 
@@ -148,7 +147,7 @@ def check_db():
              'target': report['target']}) == 1
 
 
-def test_run(database, supervisor):
+def test_run(database, supervisor, unused_tcp_port):
     # Pusher
     output_mongodb = MongoDB(DB_URI, 'MongoDB1', 'test_result')
     pusher = PusherActor("pusher_mongodb", PowerModel(), output_mongodb, level_logger=LOG_LEVEL, max_size=0)
@@ -164,8 +163,7 @@ def test_run(database, supervisor):
     dispatcher = DispatcherActor('dispatcher', formula_factory, route_table, level_logger=LOG_LEVEL)
 
     # Puller
-    input_socket = SocketDB(PORT)
-    print(PORT)
+    input_socket = SocketDB(unused_tcp_port)
     report_filter = Filter()
     report_filter.filter(lambda msg: True, dispatcher)
     puller = PullerActor("puller_socket", input_socket, report_filter, HWPCModel(), level_logger=LOG_LEVEL, stream_mode=True, asynchrone=True)
@@ -174,12 +172,12 @@ def test_run(database, supervisor):
     supervisor.launch_actor(puller)
     time.sleep(1)
     json_reports = extract_json_report(10)
-    client = ClientThread(json_reports, PORT)
+    client = ClientThread(json_reports, unused_tcp_port)
     client.start()
     time.sleep(1)
     check_db()
 
-def test_run_with_delay_between_message(database, supervisor):
+def test_run_with_delay_between_message(unused_tcp_port, database, supervisor):
     """
     run the same test but set a delay of 1s after sendig the 5th first messages
     """
@@ -198,7 +196,7 @@ def test_run_with_delay_between_message(database, supervisor):
     dispatcher = DispatcherActor('dispatcher', formula_factory, route_table, level_logger=LOG_LEVEL)
 
     # Puller
-    input_socket = SocketDB(PORT + 1)
+    input_socket = SocketDB(unused_tcp_port)
     report_filter = Filter()
     report_filter.filter(lambda msg: True, dispatcher)
     puller = PullerActor("puller_socket", input_socket, report_filter, HWPCModel(), level_logger=LOG_LEVEL, stream_mode=True, asynchrone=True)
@@ -207,8 +205,7 @@ def test_run_with_delay_between_message(database, supervisor):
     supervisor.launch_actor(puller)
     time.sleep(1)
     json_reports = extract_json_report(10)
-    client = ClientThreadDelay(json_reports, PORT + 1)
+    client = ClientThreadDelay(json_reports, unused_tcp_port)
     client.start()
     time.sleep(2)
     check_db()
-

tests/integration/database/test_socket_db.py

@@ -37,8 +37,6 @@
 from powerapi.database import SocketDB
 from powerapi.report_model import HWPCModel
 
-PORT = 6789
-
 def extract_json_report(n):
     json_file = open('tests/hwpc_reports.json', 'r')
     reports = json.load(json_file)
@@ -72,18 +70,18 @@ def assert_report_equals(hwpc_report, json_report):
 
 
 @pytest.fixture
-async def socket_db():
-    socket_db = SocketDB(PORT)
+async def socket_db(unused_tcp_port):
+    socket_db = SocketDB(unused_tcp_port)
     await socket_db.connect()
     yield socket_db
     await socket_db.stop()
 
 
 @pytest.mark.asyncio
-async def test_read_one_json_object_received_from_the_socket(socket_db):
+async def test_read_one_json_object_received_from_the_socket(socket_db, unused_tcp_port):
 
     json_reports = extract_json_report(1)
-    client = ClientThread(json_reports, PORT)
+    client = ClientThread(json_reports, unused_tcp_port)
     client.start()
 
     iterator = socket_db.iter(HWPCModel(), False)
@@ -93,9 +91,9 @@ async def test_read_one_json_object_received_from_the_socket(socket_db):
 
 
 @pytest.mark.asyncio
-async def test_read_two_json_object_received_from_the_socket(socket_db):
+async def test_read_two_json_object_received_from_the_socket(socket_db, unused_tcp_port):
     json_reports = extract_json_report(2)
-    client = ClientThread(json_reports, PORT)
+    client = ClientThread(json_reports, unused_tcp_port)
     client.start()
 
     iterator = socket_db.iter(HWPCModel(), False)