From 1cf1d0328c4e900e7a3dda47075d9ada456f5e7b Mon Sep 17 00:00:00 2001 From: liuh-80 <58683130+liuh-80@users.noreply.github.com> Date: Thu, 17 Mar 2022 15:01:47 +0800 Subject: [PATCH] Fix UT failed cause by change pycommon to use swsscommon (#2085) Fix UT failed cause by change sonic_py_common to use swss_common #### Description Fix UT failed cause by change sonic_py_common to use swss_common, here is UT failed message: 2022-02-28T09:26:11.4706067Z _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 2022-02-28T09:26:11.4706457Z scripts/route_check.py:556: in main 2022-02-28T09:26:11.4706805Z ret, res= check_routes() 2022-02-28T09:26:11.4707152Z scripts/route_check.py:491: in check_routes 2022-02-28T09:26:11.4707567Z rt_appl_miss = filter_out_local_interfaces(rt_appl_miss) 2022-02-28T09:26:11.4708035Z scripts/route_check.py:352: in filter_out_local_interfaces 2022-02-28T09:26:11.4708494Z chassis_local_intfs = chassis.get_chassis_local_interfaces() 2022-02-28T09:26:11.4708981Z utilities_common/chassis.py:7: in get_chassis_local_interfaces 2022-02-28T09:26:11.4709703Z chassisdb_conf=os.path.join('/usr/share/sonic/device/', platform, "chassisdb.conf") 2022-02-28T09:26:11.4710280Z /usr/lib/python3.7/posixpath.py:94: in join 2022-02-28T09:26:11.4710838Z genericpath._check_arg_types('join', a, *p) 2022-02-28T09:26:11.4711261Z _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ The UT failed because device_info.get_platform() return null, to fix this issue, add mock method for device_info.get_platform(). #### Motivation and Context pyswss will be deprecate, so sonic_py_common will changed to use swss_common. Some UT in this project failed because this change. #### How Has This Been Tested? Pass all UT and sonic-buildimage E2E test. --- tests/route_check_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/route_check_test.py b/tests/route_check_test.py index 7dd4035640..b4fd3ce17d 100644 --- a/tests/route_check_test.py +++ b/tests/route_check_test.py @@ -4,6 +4,7 @@ import sys import syslog import time +from sonic_py_common import device_info from unittest.mock import MagicMock, patch import pytest @@ -525,6 +526,7 @@ def test_server(self, mock_subs, mock_sel, mock_table, mock_conn): self.init() ret = 0 + device_info.get_platform = MagicMock(return_value='unittest') set_mock(mock_table, mock_conn, mock_sel, mock_subs) for (i, ct_data) in test_data.items(): do_start_test("route_test", i, ct_data)