Skip to content

Commit 4a10fce

Browse files
authored
Prepare for rc1. (#1097)
* Prepare for rc1. * Remove pytest.mark.skip
1 parent dacc393 commit 4a10fce

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

pymodbus/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __str__(self):
3636
return f"[{self.package}, version {self.short()}]"
3737

3838

39-
version = Version("pymodbus", 3, 0, 0, "dev5")
39+
version = Version("pymodbus", 3, 0, 0, "rc1")
4040
version.__name__ = ( # fix epydoc error # pylint: disable=attribute-defined-outside-init
4141
"pymodbus"
4242
)

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ url = https://github.com/riptideio/pymodbus/
1313
classifiers =
1414
Development Status :: 4 - Beta
1515
Environment :: Console
16-
Framework :: Twisted
1716
Framework :: AsyncIO
1817
Intended Audience :: Developers
1918
License :: OSI Approved :: BSD License

test/test_server_asyncio.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ async def test_async_start_server_no_loop(self):
213213
"""Test that the modbus tcp asyncio server starts correctly"""
214214
await self.start_server(do_forever=False)
215215

216-
@pytest.mark.skipif(pytest.IS_WINDOWS, reason="Windows have a timeout problem.")
217216
async def test_async_start_server(self):
218217
"""Test that the modbus tcp asyncio server starts correctly"""
219218
await self.start_server()
@@ -265,7 +264,6 @@ async def test_async_tcp_server_close_active_connection(self):
265264
await asyncio.sleep(0.5)
266265
await self.server.server_close()
267266

268-
@pytest.mark.skip
269267
async def test_async_tcp_server_no_slave(self):
270268
"""Test unknown slave unit exception"""
271269
self.context = ModbusServerContext(
@@ -278,7 +276,6 @@ async def test_async_tcp_server_no_slave(self):
278276
self.server.server_close()
279277
self.server = None
280278

281-
@pytest.mark.skip
282279
async def test_async_tcp_server_modbus_error(self):
283280
"""Test sending garbage data on a TCP socket should drop the connection"""
284281
BasicClient.data = TEST_DATA
@@ -435,7 +432,6 @@ async def test_async_udp_server_exception(self):
435432
self.server.protocol._sock._closed # pylint: disable=protected-access
436433
)
437434

438-
@pytest.mark.skip
439435
async def test_async_tcp_server_exception(self):
440436
"""Send garbage data on a TCP socket should drop the connection"""
441437
BasicClient.data = b"\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"

test/test_server_sync.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ def xtest_start_udp_server(self):
4040
with patch.object(socketserver.UDPServer, "server_bind"):
4141
StartUdpServer()
4242

43-
@pytest.mark.skip
4443
def xtest_start_serial_server(self):
4544
"""Test the serial server starting factory"""
4645
with patch.object(ModbusSerialServer, "serve_forever"):

0 commit comments

Comments
 (0)