From 1c1c42aa768dbf3a8612cf15da546aedfa16057a Mon Sep 17 00:00:00 2001
From: Carlos Natalino <carlos.natalino@chalmers.se>
Date: Mon, 18 Jul 2022 12:19:47 +0200
Subject: [PATCH] Fixing the mocks for the context component.
---
src/webui/service/main/routes.py | 4 ++--
src/webui/tests/test_unitary.py | 7 ++++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/webui/service/main/routes.py b/src/webui/service/main/routes.py
index a568c75d6..190194867 100644
--- a/src/webui/service/main/routes.py
+++ b/src/webui/service/main/routes.py
@@ -14,7 +14,7 @@
import json, logging
from flask import jsonify, redirect, render_template, Blueprint, flash, session, url_for, request
-from common.proto.context_pb2 import Context, Device, Empty, Link, Topology
+from common.proto.context_pb2 import Context, Device, Empty, Link, Topology, ContextIdList
from context.client.ContextClient import ContextClient
from device.client.DeviceClient import DeviceClient
from webui.service.main.forms import ContextForm, DescriptorForm
@@ -66,7 +66,7 @@ def process_descriptors(descriptors):
def home():
context_client.connect()
device_client.connect()
- response = context_client.ListContextIds(Empty())
+ response: ContextIdList = context_client.ListContextIds(Empty())
context_form: ContextForm = ContextForm()
context_form.context.choices.append(('', 'Select...'))
for context in response.context_ids:
diff --git a/src/webui/tests/test_unitary.py b/src/webui/tests/test_unitary.py
index 0360e3253..15521ac08 100644
--- a/src/webui/tests/test_unitary.py
+++ b/src/webui/tests/test_unitary.py
@@ -19,7 +19,7 @@ from flask.testing import FlaskClient
from flask.app import Flask
from flask.helpers import url_for
from common.DeviceTypes import DeviceTypeEnum
-from common.proto.context_pb2 import Empty, DeviceId, DeviceList, TopologyIdList
+from common.proto.context_pb2 import ContextIdList, Empty, DeviceId, DeviceList, TopologyIdList
# from device.client.DeviceClient import DeviceClient
from webui.service import create_app
@@ -38,6 +38,11 @@ class TestWebUI(ClientTestCase):
self.mocker_delete_device.start()
self.addCleanup(self.mocker_delete_device.stop)
+ self.mocker_list_context_ids = mock.patch('webui.service.device.routes.context_client.ListContextIds')
+ self.mocker_list_context_ids.return_value = ContextIdList() # returns an empty list
+ self.mocker_list_context_ids.start()
+ self.addCleanup(self.mocker_list_context_ids.stop)
+
self.mocker_list_devices = mock.patch('webui.service.device.routes.context_client.ListDevices')
self.mocker_list_devices.return_value = DeviceList() # returns an empty list
self.mocker_list_devices.start()
--
GitLab