tweaks to tests for latest versions of astral and pytest-homeassistant-custom-component

craigbarratt · craigbarratt · commit 468632679314 · 2021-05-07T22:59:03.000-07:00
diff --git a/tests/test_apps_modules.py b/tests/test_apps_modules.py
@@ -3,10 +3,10 @@
 from ast import literal_eval
 import asyncio
 import re
+from unittest.mock import patch
 
 from custom_components.pyscript.const import DOMAIN, FOLDER
 from mock_open import MockOpen
-from pytest_homeassistant_custom_component.async_mock import patch
 
 from homeassistant.const import EVENT_STATE_CHANGED
 from homeassistant.setup import async_setup_component
diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py
@@ -1,10 +1,10 @@
 """Tests for pyscript config flow."""
 import logging
+from unittest.mock import patch
 
 from custom_components.pyscript import PYSCRIPT_SCHEMA
 from custom_components.pyscript.const import CONF_ALLOW_ALL_IMPORTS, CONF_HASS_IS_GLOBAL, DOMAIN
 import pytest
-from pytest_homeassistant_custom_component.async_mock import patch
 
 from homeassistant import data_entry_flow
 from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
diff --git a/tests/test_decorator_errors.py b/tests/test_decorator_errors.py
@@ -2,11 +2,11 @@
 from ast import literal_eval
 import asyncio
 from datetime import datetime as dt
+from unittest.mock import mock_open, patch
 
 from custom_components.pyscript.const import DOMAIN
 from custom_components.pyscript.function import Function
 import custom_components.pyscript.trigger as trigger
-from pytest_homeassistant_custom_component.async_mock import mock_open, patch
 
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
 from homeassistant.setup import async_setup_component
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
@@ -2,11 +2,11 @@
 from ast import literal_eval
 import asyncio
 from datetime import datetime as dt
+from unittest.mock import mock_open, patch
 
 from custom_components.pyscript.const import DOMAIN
 from custom_components.pyscript.function import Function
 import custom_components.pyscript.trigger as trigger
-from pytest_homeassistant_custom_component.async_mock import mock_open, patch
 
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
 from homeassistant.setup import async_setup_component
diff --git a/tests/test_function.py b/tests/test_function.py
@@ -4,13 +4,13 @@
 import asyncio
 from datetime import datetime as dt
 import re
+from unittest.mock import MagicMock, Mock, patch
 
 from custom_components.pyscript.const import CONF_ALLOW_ALL_IMPORTS, CONF_HASS_IS_GLOBAL, DOMAIN, FOLDER
 from custom_components.pyscript.function import Function
 import custom_components.pyscript.trigger as trigger
 from mock_open import MockOpen
 import pytest
-from pytest_homeassistant_custom_component.async_mock import MagicMock, Mock, patch
 
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
 from homeassistant.core import Context
diff --git a/tests/test_init.py b/tests/test_init.py
@@ -3,14 +3,14 @@
 import asyncio
 from datetime import datetime as dt
 import pathlib
+from unittest.mock import mock_open, patch
 
 from custom_components.pyscript.const import DOMAIN
 from custom_components.pyscript.event import Event
 from custom_components.pyscript.function import Function
 from custom_components.pyscript.global_ctx import GlobalContextMgr
 from custom_components.pyscript.state import State
 import custom_components.pyscript.trigger as trigger
-from pytest_homeassistant_custom_component.async_mock import mock_open, patch
 
 from homeassistant import loader
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
diff --git a/tests/test_jupyter.py b/tests/test_jupyter.py
@@ -7,13 +7,13 @@
 import hmac
 import json
 import re
+from unittest.mock import patch
 import uuid
 
 from custom_components.pyscript.const import DOMAIN, FOLDER
 from custom_components.pyscript.jupyter_kernel import ZmqSocket
 import custom_components.pyscript.trigger as trigger
 from mock_open import MockOpen
-from pytest_homeassistant_custom_component.async_mock import patch
 
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP
 from homeassistant.setup import async_setup_component
diff --git a/tests/test_reload.py b/tests/test_reload.py
@@ -2,10 +2,10 @@
 
 import asyncio
 import re
+from unittest.mock import patch
 
 from custom_components.pyscript.const import DOMAIN, FOLDER
 from mock_open import MockOpen
-from pytest_homeassistant_custom_component.async_mock import patch
 
 from homeassistant.const import EVENT_STATE_CHANGED
 from homeassistant.setup import async_setup_component
diff --git a/tests/test_requirements.py b/tests/test_requirements.py
@@ -1,5 +1,6 @@
 """Test requirements helpers."""
 import logging
+from unittest.mock import patch
 
 from custom_components.pyscript.const import (
     ATTR_INSTALLED_VERSION,
@@ -14,7 +15,6 @@
 )
 from custom_components.pyscript.requirements import install_requirements, process_all_requirements
 from pytest import fixture
-from pytest_homeassistant_custom_component.async_mock import patch
 from pytest_homeassistant_custom_component.common import MockConfigEntry
 
 PYSCRIPT_FOLDER = "tests/test_data/test_requirements"
diff --git a/tests/test_state.py b/tests/test_state.py
@@ -1,6 +1,7 @@
 """Test pyscripts test module."""
+from unittest.mock import patch
+
 from custom_components.pyscript.state import State
-from pytest_homeassistant_custom_component.async_mock import patch
 
 from homeassistant.core import Context
 from homeassistant.helpers.state import State as HassState
diff --git a/tests/test_tasks.py b/tests/test_tasks.py
@@ -2,10 +2,10 @@
 
 import asyncio
 import re
+from unittest.mock import patch
 
 from custom_components.pyscript.const import DOMAIN, FOLDER
 from mock_open import MockOpen
-from pytest_homeassistant_custom_component.async_mock import patch
 
 from homeassistant.const import EVENT_STATE_CHANGED
 from homeassistant.setup import async_setup_component
diff --git a/tests/test_unique.py b/tests/test_unique.py
@@ -2,11 +2,11 @@
 from ast import literal_eval
 import asyncio
 from datetime import datetime as dt
+from unittest.mock import mock_open, patch
 
 from custom_components.pyscript.const import DOMAIN
 from custom_components.pyscript.function import Function
 import custom_components.pyscript.trigger as trigger
-from pytest_homeassistant_custom_component.async_mock import mock_open, patch
 
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_STATE_CHANGED
 from homeassistant.setup import async_setup_component
diff --git a/tests/test_unit_trigger.py b/tests/test_unit_trigger.py
@@ -1,11 +1,11 @@
 """Unit tests for time trigger functions."""
 
 from datetime import datetime as dt, timedelta
+from unittest.mock import patch
 
 from custom_components.pyscript.function import Function
 from custom_components.pyscript.trigger import TrigTime
 import pytest
-from pytest_homeassistant_custom_component.async_mock import patch
 
 parseDateTimeTests = [
     ["2019/9/12 13:45", 0, dt(2019, 9, 12, 13, 45, 0, 0)],
@@ -47,17 +47,17 @@
     ["16:01", 0, dt(2019, 9, 1, 16, 1, 0, 0)],
     ["14:56", 1, dt(2019, 9, 2, 14, 56, 0, 0)],
     ["8:00:23.6", 1, dt(2019, 9, 2, 8, 0, 23, 600000)],
-    ["sunrise", 0, dt(2019, 9, 1, 6, 37, 15, 0)],
-    ["sunrise", 1, dt(2019, 9, 2, 6, 38, 6, 0)],
-    ["sunrise", 2, dt(2019, 9, 3, 6, 38, 58, 0)],
-    ["tuesday sunrise", 0, dt(2019, 9, 3, 6, 38, 58, 0)],
-    ["sunrise + 1hr", 0, dt(2019, 9, 1, 7, 37, 15, 0)],
-    ["sunset", 0, dt(2019, 9, 1, 19, 39, 15, 0)],
+    ["sunrise", 0, dt(2019, 9, 1, 6, 37, 58, 0)],
+    ["sunrise", 1, dt(2019, 9, 2, 6, 38, 49, 0)],
+    ["sunrise", 2, dt(2019, 9, 3, 6, 39, 41, 0)],
+    ["tuesday sunrise", 0, dt(2019, 9, 3, 6, 39, 41, 0)],
+    ["sunrise + 1hr", 0, dt(2019, 9, 1, 7, 37, 58, 0)],
+    ["sunset", 0, dt(2019, 9, 1, 19, 37, 23, 0)],
     ["now", 0, dt(2019, 9, 1, 13, 0, 0, 0)],
     ["now +1 min", 0, dt(2019, 9, 1, 13, 1, 0, 0)],
     ["now +1 hours", 0, dt(2019, 9, 1, 14, 0, 0, 0)],
-    ["2019/11/4 sunset + 1min", 0, dt(2019, 11, 4, 17, 7, 56, 0)],
-    ["11/4 sunset + 2min", 0, dt(2019, 11, 4, 17, 8, 56, 0)],
+    ["2019/11/4 sunset + 1min", 0, dt(2019, 11, 4, 17, 6, 37, 0)],
+    ["11/4 sunset + 2min", 0, dt(2019, 11, 4, 17, 7, 37, 0)],
     ["+5 min", 0, dt(2019, 9, 1, 0, 5, 0, 0)],
 ]
 
@@ -166,14 +166,14 @@ async def test_parse_date_time_day_names(hass, caplog):
         ("not range(20:00, 10:00)", dt(2019, 9, 3, 19, 59, 59, 999999), True),
         ("not range(20:00, 10:00)", dt(2019, 9, 3, 12, 0, 0, 0), True),
         ("not range(20:00, 10:00)", dt(2019, 9, 3, 0, 0, 0, 0), False),
-        ("range(sunrise, sunset)", dt(2019, 9, 1, 6, 37, 14, 0), False),
-        ("range(sunrise, sunset)", dt(2019, 9, 1, 6, 37, 16, 0), True),
-        ("range(sunrise, sunset - 20m)", dt(2019, 9, 1, 19, 19, 14, 0), True),
-        ("range(sunrise, sunset - 20m)", dt(2019, 9, 1, 19, 19, 16, 0), False),
-        ("range(sunrise + 20m, sunset)", dt(2019, 9, 2, 6, 58, 5, 0), False),
-        ("range(sunrise + 20m, sunset)", dt(2019, 9, 2, 6, 58, 7, 0), True),
-        ("range(sunrise, sunset + 1m)", dt(2019, 11, 4, 17, 7, 55, 0), True),
-        ("range(sunrise, sunset + 1m)", dt(2019, 11, 4, 17, 7, 57, 0), False),
+        ("range(sunrise, sunset)", dt(2019, 9, 1, 6, 37, 57, 0), False),
+        ("range(sunrise, sunset)", dt(2019, 9, 1, 6, 37, 59, 0), True),
+        ("range(sunrise, sunset - 20m)", dt(2019, 9, 1, 19, 17, 22, 0), True),
+        ("range(sunrise, sunset - 20m)", dt(2019, 9, 1, 19, 17, 24, 0), False),
+        ("range(sunrise + 20m, sunset)", dt(2019, 9, 2, 6, 58, 48, 0), False),
+        ("range(sunrise + 20m, sunset)", dt(2019, 9, 2, 6, 58, 50, 0), True),
+        ("range(sunrise, sunset + 1m)", dt(2019, 11, 4, 17, 6, 36, 0), True),
+        ("range(sunrise, sunset + 1m)", dt(2019, 11, 4, 17, 6, 38, 0), False),
         ("cron(* * * * *)", dt(2019, 9, 3, 6, 0, 0, 0), True),
         ("cron(* * * 9 *)", dt(2019, 9, 3, 6, 0, 0, 0), True),
         ("cron(* * 3 9 *)", dt(2019, 9, 3, 6, 0, 0, 0), True),
@@ -293,14 +293,14 @@ def test_timer_active_check(hass, spec, now, expected):
     [
         ["period(sunset, 4 hours, sunrise)"],
         [
-            dt(2019, 9, 1, 19, 39, 15),
-            dt(2019, 9, 1, 23, 39, 15),
-            dt(2019, 9, 2, 3, 39, 15),
-            dt(2019, 9, 2, 19, 37, 46),
-            dt(2019, 9, 2, 23, 37, 46),
-            dt(2019, 9, 3, 3, 37, 46),
-            dt(2019, 9, 3, 19, 36, 17),
-            dt(2019, 9, 3, 23, 36, 17),
+            dt(2019, 9, 1, 19, 37, 23),
+            dt(2019, 9, 1, 23, 37, 23),
+            dt(2019, 9, 2, 3, 37, 23),
+            dt(2019, 9, 2, 19, 35, 53),
+            dt(2019, 9, 2, 23, 35, 53),
+            dt(2019, 9, 3, 3, 35, 53),
+            dt(2019, 9, 3, 19, 34, 23),
+            dt(2019, 9, 3, 23, 34, 23),
         ],
     ],
     [
