update tests and adjust functions

Author: firstof9

openevsehttp/__init__.py

@@ -4,7 +4,7 @@
 import asyncio
 import datetime
 import logging
-from typing import Optional
+from typing import Any, Optional
 
 import aiohttp  # type: ignore
 import requests  # type: ignore
@@ -165,15 +165,16 @@ def __init__(self, host: str, user: str = None, pwd: str = None) -> None:
         """Connect to an OpenEVSE charger equipped with wifi or ethernet."""
         self._user = user
         self._pwd = pwd
-        self.url = f"http://{host}"
+        self.url = f"http://{host}/"
         self._status = None
         self._config = None
         self._override = None
         self._ws_listening = False
+        self.websocket: Optional[OpenEVSEWebsocket] = None  # type: ignore
 
     def send_command(self, command: str) -> tuple | None:
         """Send a RAPI command to the charger and parses the response."""
-        url = f"{self.url}/r"
+        url = f"{self.url}r"
         data = {"json": 1, "rapi": command}
 
         _LOGGER.debug("Posting data: %s to %s", command, url)
@@ -194,10 +195,10 @@ def send_command(self, command: str) -> tuple | None:
         resp = value.json()
         return resp["cmd"], resp["ret"]
 
-    def update(self) -> None:
+    async def update(self) -> None:
         """Update the values."""
         if not self._ws_listening:
-            urls = [f"{self.url}/status", f"{self.url}/config"]
+            urls = [f"{self.url}status", f"{self.url}config"]
 
             for url in urls:
                 _LOGGER.debug("Updating data from %s", url)
@@ -216,10 +217,10 @@ def update(self) -> None:
                     self._config = value.json()
 
             # Start Websocket listening
-            websocket = OpenEVSEWebsocket(
+            self.websocket = OpenEVSEWebsocket(
                 self.url, self._update_status, self._user, self._pwd
             )
-            websocket.listen()
+            await self.websocket.listen()
             self._ws_listening = True
         else:
             url = f"{self.url}/config"
@@ -235,7 +236,7 @@ def update(self) -> None:
 
             self._config = value.json()
 
-    def _update_status(self, msgtype, data, error) -> None:
+    def _update_status(self, msgtype, data, error):
         """Update data from websocket listener."""
         if msgtype == SIGNAL_CONNECTION_STATE:
             if data == STATE_CONNECTED:
@@ -246,7 +247,8 @@ def _update_status(self, msgtype, data, error) -> None:
                     self.url,
                 )
                 self._ws_listening = False
-            # Stopped websockets without errors are expected during shutdown and ignored
+            # Stopped websockets without errors are expected during shutdown
+            # and ignored
             elif data == STATE_STOPPED and error:
                 _LOGGER.error(
                     "Websocket to %s failed, aborting [Error: %s]",
@@ -256,7 +258,21 @@ def _update_status(self, msgtype, data, error) -> None:
                 self._ws_listening = False
 
         elif msgtype == "data":
-            self._status = data.json()
+            update_data = data.json()
+
+            for key, value in update_data:
+                self._status[key] = value
+
+    def ws_disconnect(self) -> None:
+        """Disconnect the websocket listener."""
+        assert self.websocket
+        self.websocket.close()
+
+    @property
+    def ws_state(self) -> Any:
+        """Disconnect the websocket listener."""
+        assert self.websocket
+        return self.websocket.state
 
     def get_override(self) -> None:
         """Get the manual override status."""

requirements_test.txt

@@ -1,5 +1,7 @@
 pytest==6.2.4
 pytest-cov==2.12.1
 pytest-timeout==1.4.2
+pytest-aiohttp
 requests_mock
-aiohttp
+aiohttp
+aioresponses

setup.py

@@ -20,7 +20,7 @@
     long_description_content_type="text/markdown",
     packages=find_packages(exclude=["test.*", "tests"]),
     python_requires=">=3.8",
-    install_requires=["requests"],
+    install_requires=["aiohttp", "requests"],
     entry_points={},
     include_package_data=True,
     zip_safe=False,

tests/conftest.py

@@ -5,28 +5,31 @@
 import openevsehttp
 from tests.common import load_fixture
 
+from aioresponses import aioresponses
+
+TEST_URL_STATUS = "http://openevse.test.tld/status"
+TEST_URL_CONFIG = "http://openevse.test.tld/config"
+TEST_URL_RAPI = "http://openevse.test.tld/r"
+TEST_TLD = "openevse.test.tld"
+
 
 @pytest.fixture(name="test_charger_auth")
 def test_charger_auth(status_mock, config_mock):
     """Load the charger data."""
-    return openevsehttp.OpenEVSE(
-        "openevse.test.tld", user="testuser", pwd="fakepassword"
-    )
+    return openevsehttp.OpenEVSE(TEST_TLD, user="testuser", pwd="fakepassword")
 
 
 @pytest.fixture(name="test_charger_auth_err")
 def test_charger_auth_err(status_mock_err, config_mock_err):
     """Load the charger data."""
-    return openevsehttp.OpenEVSE(
-        "openevse.test.tld", user="testuser", pwd="fakepassword"
-    )
+    return openevsehttp.OpenEVSE(TEST_TLD, user="testuser", pwd="fakepassword")
 
 
 @pytest.fixture(name="status_mock_err")
 def mock_status_err(requests_mock):
     """Mock the status reply."""
     requests_mock.get(
-        "http://openevse.test.tld/status",
+        TEST_URL_STATUS,
         status_code=401,
     )
 
@@ -35,28 +38,28 @@ def mock_status_err(requests_mock):
 def mock_config_err(requests_mock):
     """Mock the config reply."""
     requests_mock.get(
-        "http://openevse.test.tld/config",
+        TEST_URL_CONFIG,
         status_code=401,
     )
 
 
 @pytest.fixture(name="test_charger")
 def test_charger(status_mock, config_mock):
     """Load the charger data."""
-    return openevsehttp.OpenEVSE("openevse.test.tld")
+    return openevsehttp.OpenEVSE(TEST_TLD)
 
 
 @pytest.fixture(name="test_charger_v2")
 def test_charger_v2(status_mock_v2, config_mock_v2):
     """Load the charger data."""
-    return openevsehttp.OpenEVSE("openevse.test.tld")
+    return openevsehttp.OpenEVSE(TEST_TLD)
 
 
 @pytest.fixture(name="status_mock")
 def mock_status(requests_mock):
     """Mock the status reply."""
     requests_mock.get(
-        "http://openevse.test.tld/status",
+        TEST_URL_STATUS,
         text=load_fixture("v4_json/status.json"),
     )
 
@@ -65,7 +68,7 @@ def mock_status(requests_mock):
 def mock_config(requests_mock):
     """Mock the config reply."""
     requests_mock.get(
-        "http://openevse.test.tld/config",
+        TEST_URL_CONFIG,
         text=load_fixture("v4_json/config.json"),
     )
 
@@ -74,7 +77,7 @@ def mock_config(requests_mock):
 def mock_status_v2(requests_mock):
     """Mock the status reply."""
     requests_mock.get(
-        "http://openevse.test.tld/status",
+        TEST_URL_STATUS,
         text=load_fixture("v2_json/status.json"),
     )
 
@@ -83,7 +86,7 @@ def mock_status_v2(requests_mock):
 def mock_config_v2(requests_mock):
     """Mock the config reply."""
     requests_mock.get(
-        "http://openevse.test.tld/config",
+        TEST_URL_CONFIG,
         text=load_fixture("v2_json/config.json"),
     )
 
@@ -93,7 +96,7 @@ def mock_send_command(requests_mock):
     """Mock the command reply."""
     value = {"cmd": "OK", "ret": "$OK^20"}
     requests_mock.post(
-        "http://openevse.test.tld/r",
+        TEST_URL_RAPI,
         text=json.dumps(value),
     )
 
@@ -102,7 +105,7 @@ def mock_send_command(requests_mock):
 def mock_send_command_parse_err(requests_mock):
     """Mock the command reply parse err."""
     requests_mock.post(
-        "http://openevse.test.tld/r",
+        TEST_URL_RAPI,
         status_code=400,
     )
 
@@ -111,7 +114,7 @@ def mock_send_command_parse_err(requests_mock):
 def mock_send_command_auth_err(requests_mock):
     """Mock the command reply auth err."""
     requests_mock.post(
-        "http://openevse.test.tld/r",
+        TEST_URL_RAPI,
         status_code=401,
     )
 
@@ -121,7 +124,7 @@ def mock_send_command_missing(requests_mock):
     """Mock the command reply."""
     value = {"cmd": "OK", "what": "$NK^21"}
     requests_mock.post(
-        "http://openevse.test.tld/r",
+        TEST_URL_RAPI,
         text=json.dumps(value),
     )
 
@@ -131,6 +134,21 @@ def mock_send_command_failed(requests_mock):
     """Mock the command reply."""
     value = {"cmd": "OK", "ret": "$NK^21"}
     requests_mock.post(
-        "http://openevse.test.tld/r",
+        TEST_URL_RAPI,
         text=json.dumps(value),
     )
+
+
+@pytest.fixture
+def aioclient_mock():
+    """Fixture to mock aioclient calls."""
+    with aioresponses() as mock_aiohttp:
+        mock_headers = {"content-type": "application/json"}
+        mock_aiohttp.get(
+            "ws://openevse.test.tld/ws",
+            status=200,
+            headers=mock_headers,
+            body={},
+        )
+
+        yield mock_aiohttp