Skip to content

Commit

Permalink
Merge pull request #590 from fronzbot/fix-inclusion
Browse files Browse the repository at this point in the history 
Fix inclusion
  • Loading branch information
@fronzbot
fronzbot authored Jun 26, 2022
2 parents 9315c43 + e8af309 commit d87d960
Show file tree
Hide file tree
Showing 4 changed files with 228 additions and 32 deletions.
2 changes: 1 addition & 1 deletion blinkpy/blinkpy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def setup_camera_list(self):
all_cameras[camera_network] = []
for camera in network["cameras"]:
all_cameras[camera_network].append(
{"name": camera["name"], "id": camera["id"]}
{"name": camera["name"], "id": camera["id"], "type": "default"}
)
mini_cameras = self.setup_owls()
lotus_cameras = self.setup_lotus()
Expand Down
1 change: 1 addition & 0 deletions blinkpy/sync_module.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ def update_cameras(self, camera_type=BlinkCamera):
type_map = {
"mini": BlinkCameraMini,
"lotus": BlinkDoorbell,
"default": BlinkCamera,
}
try:
for camera_config in self.camera_list:
Expand Down
181 changes: 150 additions & 31 deletions tests/test_blinkpy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,11 @@ def test_setup_cameras(self, mock_home, mock_req):
self.assertEqual(
result,
{
"1234": [{"name": "foo", "id": 5678}, {"name": "bar", "id": 5679}],
"4321": [{"name": "test", "id": 0000}],
"1234": [
{"name": "foo", "id": 5678, "type": "default"},
{"name": "bar", "id": 5679, "type": "default"},
],
"4321": [{"name": "test", "id": 0000, "type": "default"}],
},
)

Expand Down Expand Up @@ -327,35 +330,6 @@ def test_initialize_blink_doorbells(self, mock_start):
self.assertEqual(self.blink.sync["foo"].name, "foo")
self.assertEqual(self.blink.sync["bar"].name, "bar")

# def test_blink_doorbell_cameras_returned(self):
# """Test that blink doorbell cameras are found if attached to sync module."""
# self.blink.network_ids = ["1234"]
# self.blink.homescreen = {
# "doorbells": [
# {
# "id": 1,
# "name": "foo",
# "network_id": 1234,
# "onboarded": True,
# "enabled": True,
# "status": "online",
# "thumbnail": "/foo/bar",
# "serial": "abc123",
# }
# ]
# }
# result = self.blink.setup_lotus()
# self.assertEqual(self.blink.network_ids, ["1234"])
# self.assertEqual(
# result, [{"1234": {"name": "foo", "id": "1234", "type": "doorbell"}}]
# )

# self.blink.network_ids = []
# self.blink.get_homescreen()
# result = self.blink.setup_lotus()
# self.assertEqual(self.blink.network_ids, [])
# self.assertEqual(result, [])

@mock.patch("blinkpy.api.request_camera_usage")
def test_blink_doorbell_attached_to_sync(self, mock_usage):
"""Test that blink doorbell cameras are properly attached to sync module."""
Expand All @@ -380,6 +354,151 @@ def test_blink_doorbell_attached_to_sync(self, mock_usage):
result, {"1234": [{"name": "foo", "id": "1234", "type": "doorbell"}]}
)

@mock.patch("blinkpy.api.request_camera_usage")
def test_blink_multi_doorbell(self, mock_usage):
"""Test that multiple doorbells are properly attached to sync module."""
self.blink.network_ids = ["1234"]
self.blink.homescreen = {
"doorbells": [
{
"id": 1,
"name": "foo",
"network_id": 1234,
"onboarded": True,
"enabled": True,
"status": "online",
"thumbnail": "/foo/bar",
"serial": "abc123",
},
{
"id": 2,
"name": "bar",
"network_id": 1234,
"onboarded": True,
"enabled": True,
"status": "online",
"thumbnail": "/bar/foo",
"serial": "zxc456",
},
]
}
expected = {
"1234": [
{"name": "foo", "id": "1234", "type": "doorbell"},
{"name": "bar", "id": "1234", "type": "doorbell"},
]
}
mock_usage.return_value = {"networks": [{"cameras": [], "network_id": 1234}]}
result = self.blink.setup_camera_list()
self.assertEqual(result, expected)

@mock.patch("blinkpy.api.request_camera_usage")
def test_blink_multi_mini(self, mock_usage):
"""Test that multiple minis are properly attached to sync module."""
self.blink.network_ids = ["1234"]
self.blink.homescreen = {
"owls": [
{
"id": 1,
"name": "foo",
"network_id": 1234,
"onboarded": True,
"enabled": True,
"status": "online",
"thumbnail": "/foo/bar",
"serial": "abc123",
},
{
"id": 2,
"name": "bar",
"network_id": 1234,
"onboarded": True,
"enabled": True,
"status": "online",
"thumbnail": "/bar/foo",
"serial": "zxc456",
},
]
}
expected = {
"1234": [
{"name": "foo", "id": "1234", "type": "mini"},
{"name": "bar", "id": "1234", "type": "mini"},
]
}
mock_usage.return_value = {"networks": [{"cameras": [], "network_id": 1234}]}
result = self.blink.setup_camera_list()
self.assertEqual(result, expected)

@mock.patch("blinkpy.api.request_camera_usage")
def test_blink_camera_mix(self, mock_usage):
"""Test that a mix of cameras are properly attached to sync module."""
self.blink.network_ids = ["1234"]
self.blink.homescreen = {
"doorbells": [
{
"id": 1,
"name": "foo",
"network_id": 1234,
"onboarded": True,
"enabled": True,
"status": "online",
"thumbnail": "/foo/bar",
"serial": "abc123",
},
{
"id": 2,
"name": "bar",
"network_id": 1234,
"onboarded": True,
"enabled": True,
"status": "online",
"thumbnail": "/bar/foo",
"serial": "zxc456",
},
],
"owls": [
{
"id": 3,
"name": "dead",
"network_id": 1234,
"onboarded": True,
"enabled": True,
"status": "online",
"thumbnail": "/dead/beef",
"serial": "qwerty",
},
{
"id": 4,
"name": "beef",
"network_id": 1234,
"onboarded": True,
"enabled": True,
"status": "online",
"thumbnail": "/beef/dead",
"serial": "dvorak",
},
],
}
expected = {
"1234": [
{"name": "foo", "id": "1234", "type": "doorbell"},
{"name": "bar", "id": "1234", "type": "doorbell"},
{"name": "dead", "id": "1234", "type": "mini"},
{"name": "beef", "id": "1234", "type": "mini"},
{"name": "normal", "id": "1234", "type": "default"},
]
}
mock_usage.return_value = {
"networks": [
{"cameras": [{"name": "normal", "id": "1234"}], "network_id": 1234}
]
}
result = self.blink.setup_camera_list()
self.assertTrue("1234" in result)
for element in result["1234"]:
self.assertTrue(element in expected["1234"])


class MockSync:
"""Mock sync module class."""
Expand Down
76 changes: 76 additions & 0 deletions tests/test_sync_module.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
import unittest
from unittest import mock

from random import shuffle

from blinkpy.blinkpy import Blink
from blinkpy.helpers.util import BlinkURLHandler
from blinkpy.sync_module import BlinkSyncModule, BlinkOwl, BlinkLotus
Expand Down Expand Up @@ -309,3 +311,77 @@ def test_lotus_start(self, mock_resp):
self.assertTrue(lotus.start())
self.assertTrue("doo" in lotus.cameras)
self.assertEqual(lotus.cameras["doo"].__class__, BlinkDoorbell)

def test_sync_with_mixed_cameras(self, mock_resp):
"""Test sync module with mixed cameras attached."""
resp_sync = {
"syncmodule": {
"network_id": 1234,
"id": 1,
"serial": 456,
"status": "onboarded",
}
}
resp_network_info = {"network": {"sync_module_error": False}}
resp_videos = {"media": []}
resp_empty = {}

self.blink.sync["test"].camera_list = [
{"name": "foo", "id": 10, "type": "default"},
{"name": "bar", "id": 11, "type": "mini"},
{"name": "fake", "id": 12, "type": "lotus"},
]

self.blink.homescreen = {
"owls": [{"name": "bar", "id": 3}],
"doorbells": [{"name": "fake", "id": 12}],
}

side_effect = [
resp_sync,
resp_network_info,
resp_videos,
resp_empty,
resp_empty,
resp_empty,
resp_empty,
resp_empty,
resp_empty,
]

mock_resp.side_effect = side_effect

test_sync = self.blink.sync["test"]

self.assertTrue(test_sync.start())
self.assertEqual(test_sync.cameras["foo"].__class__, BlinkCamera)
self.assertEqual(test_sync.cameras["bar"].__class__, BlinkCameraMini)
self.assertEqual(test_sync.cameras["fake"].__class__, BlinkDoorbell)

# Now shuffle the cameras and see if it still works
for i in range(0, 10):
shuffle(test_sync.camera_list)
mock_resp.side_effect = side_effect
self.assertTrue(test_sync.start())
debug_msg = f"Iteration: {i}, {test_sync.camera_list}"
self.assertEqual(
test_sync.cameras["foo"].__class__, BlinkCamera, msg=debug_msg
)
self.assertEqual(
test_sync.cameras["bar"].__class__, BlinkCameraMini, msg=debug_msg
)
self.assertEqual(
test_sync.cameras["fake"].__class__, BlinkDoorbell, msg=debug_msg
)

def test_name_not_in_config(self, mock_resp):
"""Check that function exits when name not in camera_config."""
test_sync = self.blink.sync["test"]
test_sync.camera_list = [{"foo": "bar"}]
self.assertTrue(test_sync.update_cameras())

def test_camera_config_key_error(self, mock_resp):
"""Check that update returns False on KeyError."""
test_sync = self.blink.sync["test"]
test_sync.camera_list = [{"name": "foobar"}]
self.assertFalse(test_sync.update_cameras())

0 comments on commit d87d960

Please sign in to comment.