fix pizigate:/dev/ttyAMA0 syntx

Author: doudz

tests/test_uart.py

@@ -1,5 +1,5 @@
 from unittest import mock
-from .async_mock import MagicMock
+from .async_mock import MagicMock, AsyncMock
 
 import pytest
 import serial_asyncio
@@ -9,10 +9,6 @@
 from zigpy_zigate import uart
 from zigpy_zigate import common
 
-DEVICE_CONFIG = zigpy_zigate.config.SCHEMA_DEVICE(
-    {zigpy_zigate.config.CONF_DEVICE_PATH: "/dev/null"}
-)
-
 
 @pytest.fixture
 def gw():
@@ -22,14 +18,23 @@ def gw():
 
 
 @pytest.mark.asyncio
-async def test_connect(monkeypatch):
+@pytest.mark.parametrize(
+    "port",
+    ('/dev/null', 'pizigate:/dev/ttyAMA0'),
+)
+async def test_connect(port, monkeypatch):
     api = mock.MagicMock()
 
-    async def mock_conn(loop, protocol_factory, **kwargs):
+    async def mock_conn(loop, protocol_factory, url, **kwargs):
         protocol = protocol_factory()
         loop.call_soon(protocol.connection_made, None)
+        assert url.startswith('/') is True
         return None, protocol
     monkeypatch.setattr(serial_asyncio, 'create_serial_connection', mock_conn)
+    monkeypatch.setattr(common, 'set_pizigate_running_mode', AsyncMock())
+    DEVICE_CONFIG = zigpy_zigate.config.SCHEMA_DEVICE(
+        {zigpy_zigate.config.CONF_DEVICE_PATH: port}
+    )
 
     await uart.connect(DEVICE_CONFIG, api)
 

zigpy_zigate/__init__.py

@@ -1,5 +1,5 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 7
-PATCH_VERSION = '1'
+PATCH_VERSION = '2'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)

zigpy_zigate/uart.py

@@ -142,6 +142,9 @@ async def connect(device_config: Dict[str, Any], api, loop=None):
         if c.is_pizigate(port):
             LOGGER.debug('PiZiGate detected')
             await c.set_pizigate_running_mode()
+            # in case of pizigate:/dev/ttyAMA0 syntax
+            if port.startswith('pizigate:'):
+                port = port[9:]
         elif c.is_zigate_din:
             LOGGER.debug('ZiGate USB DIN detected')
             await c.set_zigatedin_running_mode()