From b77befefef7cb8d357fb15ec1ca77cb3ed8375e1 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Fri, 26 Jul 2024 09:46:37 +0200
Subject: [PATCH] fix(ci): snake_case style fix and use of logging.error
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
test/CNTestLib.py | 16 ++++++++--------
test/docker_api.py | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/test/CNTestLib.py b/test/CNTestLib.py
index ef7125ae..7d7ef4ab 100644
--- a/test/CNTestLib.py
+++ b/test/CNTestLib.py
@@ -138,21 +138,21 @@ class CNTestLib:
log_dir = get_log_dir()
if folder:
log_dir = os.path.join(log_dir, folder)
- cnList = self.docker_api.store_all_logs(log_dir, all_services)
- for filename in cnList:
+ cn_log_list = self.docker_api.store_all_logs(log_dir, all_services)
+ for filename in cn_log_list:
if re.search('mysql', filename) is not None or re.search('oai-ext-dn', filename) is not None or re.search('trace_dummy', filename) is not None:
continue
name_split = filename.split('logs/')
- byeMessagePresent = False
+ bye_message_present = False
with open(filename, 'r') as f:
for line in f:
result = re.search('system.*info.* Bye. Shutdown Procedure took (?P<duration>[0-9]+) ms', line)
- if result is not None and not byeMessagePresent:
- byeMessagePresent = True
+ if result is not None and not bye_message_present:
+ bye_message_present = True
duration = int(result.group('duration'))
- print(f'{name_split[1]} container properly shutdown in {duration} ms.')
- if not byeMessagePresent:
- print(f'{name_split[1]} container did NOT properly shutdown.')
+ logging.info(f'{name_split[1]} container properly shutdown in {duration} ms.')
+ if not bye_message_present:
+ logging.error(f'{name_split[1]} container did NOT properly shutdown.')
def configure_default_qos(self, five_qi=9, session_ambr=50):
print("TODO implement me")
diff --git a/test/docker_api.py b/test/docker_api.py
index dad81d21..8f82a8ec 100644
--- a/test/docker_api.py
+++ b/test/docker_api.py
@@ -76,7 +76,7 @@ class DockerApi:
def store_all_logs(self, log_dir, container_list=None):
containers = self.client.containers(all=True)
- listOfLogFiles = []
+ list_of_logs = []
for container in containers:
name = container["Names"][0][1:]
if container_list and name not in container_list:
@@ -88,8 +88,8 @@ class DockerApi:
os.makedirs(log_dir)
with open(file_name, "w") as f:
f.write(log)
- listOfLogFiles.append(file_name)
- return listOfLogFiles
+ list_of_logs.append(file_name)
+ return list_of_logs
def get_log(self, container):
return self.client.logs(container).decode()
--
GitLab