Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-testing-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ jobs:
unit-test-storage:
needs: changes
if: ${{ needs.changes.outputs.storage == 'true' || github.event_name == 'push' }}
timeout-minutes: 18 # if this timeout gets too small, then split the tests
timeout-minutes: 25 # if this timeout gets too small, then split the tests
name: "[unit] storage"
runs-on: ${{ matrix.os }}
strategy:
Expand Down
10 changes: 7 additions & 3 deletions packages/pytest-simcore/src/pytest_simcore/docker_compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# pylint: disable=unused-argument
# pylint: disable=unused-variable

""" Fixtures to create docker-compose.yaml configuration files (as in Makefile)
"""Fixtures to create docker-compose.yaml configuration files (as in Makefile)

- Basically runs `docker compose config
- Services in stack can be selected using 'core_services_selection', 'ops_services_selection' fixtures
- Basically runs `docker compose config
- Services in stack can be selected using 'core_services_selection', 'ops_services_selection' fixtures

"""

Expand Down Expand Up @@ -391,6 +391,10 @@ def _filter_services_and_dump(
if "environment" in service:
service["environment"] = _minio_fix(service["environment"])

if name == "postgres":
# NOTE: # -c fsync=off is not recommended for production as this disable writing to disk https://pythonspeed.com/articles/faster-db-tests/
service["command"] += ["-c", "fsync=off"]

# updates current docker-compose (also versioned ... do not change by hand)
with docker_compose_path.open("wt") as fh:
yaml.dump(content, fh, default_flow_style=False)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,18 @@ async def create(
cls, *, client_name: str, settings: RabbitSettings, **kwargs
) -> "RabbitMQRPCClient":
client = cls(client_name=client_name, settings=settings, **kwargs)
await client._rpc_initialize() # noqa: SLF001
await client._rpc_initialize()
return client

async def _rpc_initialize(self) -> None:
# NOTE: to show the connection name in the rabbitMQ UI see there
# https://www.bountysource.com/issues/89342433-setting-custom-connection-name-via-client_properties-doesn-t-work-when-connecting-using-an-amqp-url
#
connection_name = f"{get_rabbitmq_client_unique_name(self.client_name)}.rpc"
url = f"{self.settings.dsn}?name={connection_name}"
self._connection = await aio_pika.connect_robust(
self.settings.dsn,
client_properties={
"connection_name": f"{get_rabbitmq_client_unique_name(self.client_name)}.rpc"
},
url,
client_properties={"connection_name": connection_name},
)
self._channel = await self._connection.channel()

Expand Down
2 changes: 1 addition & 1 deletion packages/settings-library/src/settings_library/redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ def build_redis_dsn(self, db_index: RedisDatabase) -> str:
),
host=self.REDIS_HOST,
port=self.REDIS_PORT,
path=f"/{db_index}",
path=f"{db_index}",
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ async def result(
exc_type = ""
exc_msg = ""
with log_catch(logger=_logger, reraise=False):
task_error = TaskError.model_validate_json(_result)
task_error = TaskError.model_validate(_result)
exc_type = task_error.exc_type
exc_msg = task_error.exc_msg
raise JobError(job_id=job_id, exc_type=exc_type, exc_msg=exc_msg)
Expand Down
Loading