From f1459b612bc30f596427aa06d72177bf0a97d141 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 28 Feb 2022 07:57:22 +0000 Subject: [PATCH 1/5] Fix UT failed cause by switch sonic_py_common to use swsscommon --- sonic-pcied/tests/test_DaemonPcied.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sonic-pcied/tests/test_DaemonPcied.py b/sonic-pcied/tests/test_DaemonPcied.py index 24044767e..0d2043e2f 100644 --- a/sonic-pcied/tests/test_DaemonPcied.py +++ b/sonic-pcied/tests/test_DaemonPcied.py @@ -19,6 +19,7 @@ NOT_AVAILABLE = 'N/A' daemon_base.db_connect = mock.MagicMock() +swsscommon.Table = mock.MagicMock() tests_path = os.path.dirname(os.path.abspath(__file__)) From 12afd2f5e8caf2c241916323084b99e937062d16 Mon Sep 17 00:00:00 2001 From: liuh-80 Date: Mon, 28 Feb 2022 08:42:55 +0000 Subject: [PATCH 2/5] Fix UT issue --- sonic-pcied/tests/test_DaemonPcied.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sonic-pcied/tests/test_DaemonPcied.py b/sonic-pcied/tests/test_DaemonPcied.py index 0d2043e2f..d92407820 100644 --- a/sonic-pcied/tests/test_DaemonPcied.py +++ b/sonic-pcied/tests/test_DaemonPcied.py @@ -2,6 +2,7 @@ import os import sys from imp import load_source # Replace with importlib once we no longer need to support Python 2 +from swsscommon import swsscommon import pytest From 3f018dc0c7e8c388f71df63933d414a7137fe2cf Mon Sep 17 00:00:00 2001 From: liuh-80 Date: Tue, 15 Mar 2022 08:34:27 +0000 Subject: [PATCH 3/5] Fix load mock lib issue --- sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py | 9 +++++++++ sonic-pcied/tests/test_DaemonPcied.py | 8 +++----- sonic-pcied/tests/test_pcied.py | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py b/sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py index 6947a8601..b9cff3078 100644 --- a/sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py +++ b/sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py @@ -52,3 +52,12 @@ def __repr__(self): def __str__(self): return repr(self.fv_dict) + +class ConfigDBConnector: + pass + +class SonicDBConfig: + pass + +class SonicV2Connector: + pass \ No newline at end of file diff --git a/sonic-pcied/tests/test_DaemonPcied.py b/sonic-pcied/tests/test_DaemonPcied.py index d92407820..bf7aa38df 100644 --- a/sonic-pcied/tests/test_DaemonPcied.py +++ b/sonic-pcied/tests/test_DaemonPcied.py @@ -2,7 +2,6 @@ import os import sys from imp import load_source # Replace with importlib once we no longer need to support Python 2 -from swsscommon import swsscommon import pytest @@ -12,15 +11,11 @@ else: import mock -from sonic_py_common import daemon_base - from .mock_platform import MockPcieUtil SYSLOG_IDENTIFIER = 'pcied_test' NOT_AVAILABLE = 'N/A' -daemon_base.db_connect = mock.MagicMock() -swsscommon.Table = mock.MagicMock() tests_path = os.path.dirname(os.path.abspath(__file__)) @@ -28,6 +23,9 @@ mocked_libs_path = os.path.join(tests_path, "mocked_libs") sys.path.insert(0, mocked_libs_path) +from sonic_py_common import daemon_base +daemon_base.db_connect = mock.MagicMock() + # Add path to the file under test so that we can load it modules_path = os.path.dirname(tests_path) scripts_path = os.path.join(modules_path, "scripts") diff --git a/sonic-pcied/tests/test_pcied.py b/sonic-pcied/tests/test_pcied.py index f3b3e78e9..d22cf203e 100644 --- a/sonic-pcied/tests/test_pcied.py +++ b/sonic-pcied/tests/test_pcied.py @@ -9,7 +9,6 @@ from unittest import mock else: import mock -from sonic_py_common import daemon_base, device_info from .mock_platform import MockPcieUtil @@ -18,6 +17,7 @@ # Add mocked_libs path so that the file under test can load mocked modules from there mocked_libs_path = os.path.join(tests_path, "mocked_libs") sys.path.insert(0, mocked_libs_path) +from sonic_py_common import daemon_base, device_info # Add path to the file under test so that we can load it modules_path = os.path.dirname(tests_path) From 749212b779eda13500da33375b4931709a1553d7 Mon Sep 17 00:00:00 2001 From: liuh-80 Date: Tue, 15 Mar 2022 08:35:38 +0000 Subject: [PATCH 4/5] Fix missing new line at end of file --- sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py b/sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py index b9cff3078..e5aa2a2ba 100644 --- a/sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py +++ b/sonic-pcied/tests/mocked_libs/swsscommon/swsscommon.py @@ -60,4 +60,4 @@ class SonicDBConfig: pass class SonicV2Connector: - pass \ No newline at end of file + pass From 993c99b2f5e834db90e2be6e02f884b62536f46a Mon Sep 17 00:00:00 2001 From: liuh-80 Date: Thu, 17 Mar 2022 01:45:59 +0000 Subject: [PATCH 5/5] Fix code issue --- sonic-pcied/tests/test_pcied.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sonic-pcied/tests/test_pcied.py b/sonic-pcied/tests/test_pcied.py index 6e324e721..3850d38ed 100644 --- a/sonic-pcied/tests/test_pcied.py +++ b/sonic-pcied/tests/test_pcied.py @@ -10,7 +10,6 @@ else: from mock import MagicMock, patch, mock_open -from sonic_py_common import daemon_base, device_info from .mock_platform import MockPcieUtil tests_path = os.path.dirname(os.path.abspath(__file__))