diff --git a/src/node/api_clients/rest.py b/src/node/api_clients/rest.py index 6993e30..f063283 100644 --- a/src/node/api_clients/rest.py +++ b/src/node/api_clients/rest.py @@ -12,12 +12,12 @@ class REST(BaseClient): def rest_call(self, method, endpoint, payload=None): url = f"http://127.0.0.1:{self._rest_port}/{endpoint}" - headers = {"Content-Type": "application/json"} + headers = {"Content-Type": "application/json", "Connection": "close"} return self.make_request(method, url, headers=headers, data=payload) def rest_call_text(self, method, endpoint, payload=None): url = f"http://127.0.0.1:{self._rest_port}/{endpoint}" - headers = {"accept": "text/plain"} + headers = {"accept": "text/plain", "Connection": "close"} return self.make_request(method, url, headers=headers, data=payload) def info(self): diff --git a/src/node/docker_mananger.py b/src/node/docker_mananger.py index 63f49cb..a27505d 100644 --- a/src/node/docker_mananger.py +++ b/src/node/docker_mananger.py @@ -36,8 +36,8 @@ class DockerManager: return network def start_container(self, image_name, port_bindings, args, log_path, volumes, entrypoint, remove_container=True, name=None, command=None): + cli_args = [] if command is None: - cli_args = [] for key, value in args.items(): if isinstance(value, list): # Check if value is a list cli_args.extend([f"--{key}={item}" for item in value]) # Add a command for each item in the list diff --git a/src/node/nomos_node.py b/src/node/nomos_node.py index d44cdef..9cbcb6c 100644 --- a/src/node/nomos_node.py +++ b/src/node/nomos_node.py @@ -43,7 +43,7 @@ class NomosNode: @retry(stop=stop_after_delay(60), wait=wait_fixed(0.1), reraise=True) def start(self, wait_for_node_sec=120, **kwargs): - logger.debug("Starting Node...") + logger.debug(f"Starting Node {self._container_name}") self._docker_manager.create_network() self._ext_ip = self._docker_manager.generate_random_ext_ip() diff --git a/src/steps/da.py b/src/steps/da.py index c534e75..2422b48 100644 --- a/src/steps/da.py +++ b/src/steps/da.py @@ -1,4 +1,5 @@ import allure +from tenacity import retry, stop_after_delay, wait_fixed from src.env_vars import NOMOS_EXECUTOR from src.steps.common import StepsCommon @@ -45,13 +46,11 @@ class StepsDataAvailability(StepsCommon): return executor @allure.step + @retry(stop=stop_after_delay(20), wait=wait_fixed(0.1), reraise=True) def disperse_data(self, data, app_id, index): request = prepare_dispersal_request(data, app_id, index) executor = self.find_executor_node() - try: - executor.send_dispersal_request(request) - except Exception as ex: - assert "Bad Request" in str(ex) or "Internal Server Error" in str(ex) + executor.send_dispersal_request(request) @allure.step def get_data_range(self, node, app_id, start, end):