From b3e63f08f5b0227121e6333cdac149b668083798 Mon Sep 17 00:00:00 2001 From: jan iversen Date: Thu, 27 Jul 2023 18:43:02 +0200 Subject: [PATCH] xdist loadscope (test is not split). (#1708) --- LICENSE | 3 --- README.rst | 6 ------ setup.cfg | 2 +- test/sub_transport/conftest.py | 3 ++- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/LICENSE b/LICENSE index 862459c66..c4d876337 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,3 @@ -Copyright (c) 2011 Galen Collins -All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.rst b/README.rst index bd8c4ce2f..09b249482 100644 --- a/README.rst +++ b/README.rst @@ -288,10 +288,4 @@ We always have more work than time, so feel free to open a discussion / issue on License Information ------------------------------------------------------------ -Pymodbus is built on top of code developed from/by: - * Copyright (c) 2001-2005 S.W.A.C. GmbH, Germany. - * Copyright (c) 2001-2005 S.W.A.C. Bohemia s.r.o., Czech Republic. - - * Hynek Petrak, https://github.com/HynekPetrak - Released under the `BSD License `_ diff --git a/setup.cfg b/setup.cfg index 552c6bbd7..1f7b827b8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -249,7 +249,7 @@ upload_dir = build/sphinx/html [tool:pytest] # log_cli = true testpaths = test -addopts = -p no:warnings --dist loadgroup --numprocesses auto +addopts = -p no:warnings --dist loadscope --numprocesses auto asyncio_mode = auto timeout = 40 diff --git a/test/sub_transport/conftest.py b/test/sub_transport/conftest.py index be86cbe78..e211e46d2 100644 --- a/test/sub_transport/conftest.py +++ b/test/sub_transport/conftest.py @@ -88,12 +88,13 @@ def prepare_commparams_client(use_port, use_host, use_comm_type): """Prepare CommParamsClass object.""" if use_host == NULLMODEM_HOST and use_comm_type == CommType.SERIAL: use_host = f"{NULLMODEM_HOST}:{use_port}" + timeout = 10 if not pytest.IS_WINDOWS else 5 return CommParams( comm_name="test comm", comm_type=use_comm_type, reconnect_delay=1, reconnect_delay_max=3.5, - timeout_connect=2, + timeout_connect=timeout, host=use_host, port=use_port, baudrate=9600,