Fix UT

Signed-off-by: maipbui <maibui@microsoft.com>
sonic-net · Nov 7, 2022 · 4efddb6 · 4efddb6
1 parent ff626f7
commit 4efddb6
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 43 deletions.
diff --git a/tests/caclmgrd/caclmgrd_bfd_test.py b/tests/caclmgrd/caclmgrd_bfd_test.py
@@ -34,19 +34,18 @@ def test_caclmgrd_bfd(self, test_name, test_data, fs):
 
         MockConfigDb.set_config_db(test_data["config_db"])
 
-        with mock.patch("caclmgrd.subprocess") as mocked_subprocess:
-            popen_mock = mock.Mock()
-            popen_attrs = test_data["popen_attributes"]
-            popen_mock.configure_mock(**popen_attrs)
-            mocked_subprocess.Popen.return_value = popen_mock
-            mocked_subprocess.PIPE = -1
-
-            call_rc = test_data["call_rc"]
-            mocked_subprocess.call.return_value = call_rc
-
-            self.caclmgrd.ControlPlaneAclManager.get_namespace_mgmt_ip = mock.MagicMock()
-            self.caclmgrd.ControlPlaneAclManager.get_namespace_mgmt_ipv6 = mock.MagicMock()
-            caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd")
-            caclmgrd_daemon.allow_bfd_protocol('')
-            mocked_subprocess.Popen.assert_has_calls(test_data["expected_subprocess_calls"], any_order=True)
+        with mock.patch("caclmgrd.ControlPlaneAclManager.run_commands_pipe", return_value='sonic'):
+            with mock.patch("caclmgrd.subprocess") as mocked_subprocess:
+                popen_mock = mock.Mock()
+                popen_attrs = test_data["popen_attributes"]
+                popen_mock.configure_mock(**popen_attrs)
+                mocked_subprocess.Popen.return_value = popen_mock
+                mocked_subprocess.PIPE = -1
+
+                call_rc = test_data["call_rc"]
+                mocked_subprocess.call.return_value = call_rc
+
+                caclmgrd_daemon = self.caclmgrd.ControlPlaneAclManager("caclmgrd")
+                caclmgrd_daemon.allow_bfd_protocol('')
+                mocked_subprocess.Popen.assert_has_calls(test_data["expected_subprocess_calls"], any_order=True)
 
diff --git a/tests/hostcfgd/test_vectors.py b/tests/hostcfgd/test_vectors.py
@@ -1129,36 +1129,36 @@
                 },
             },
             "enable_feature_subprocess_calls": [
-                call('sudo systemctl unmask bgp@0.service', shell=True),
-                call('sudo systemctl enable bgp@0.service', shell=True),
-                call('sudo systemctl start bgp@0.service', shell=True),
-                call('sudo systemctl unmask bgp@1.service', shell=True),
-                call('sudo systemctl enable bgp@1.service', shell=True),
-                call('sudo systemctl start bgp@1.service', shell=True),
-                call('sudo systemctl unmask teamd@0.service', shell=True),
-                call('sudo systemctl enable teamd@0.service', shell=True),
-                call('sudo systemctl start teamd@0.service', shell=True),
-                call('sudo systemctl unmask teamd@1.service', shell=True),
-                call('sudo systemctl enable teamd@1.service', shell=True),
-                call('sudo systemctl start teamd@1.service', shell=True),
-                call('sudo systemctl unmask lldp.service', shell=True),
-                call('sudo systemctl enable lldp.service', shell=True),
-                call('sudo systemctl start lldp.service', shell=True),
-                call('sudo systemctl unmask lldp@0.service', shell=True),
-                call('sudo systemctl enable lldp@0.service', shell=True),
-                call('sudo systemctl start lldp@0.service', shell=True),
-                call('sudo systemctl unmask lldp@1.service', shell=True),
-                call('sudo systemctl enable lldp@1.service', shell=True),
-                call('sudo systemctl start lldp@1.service', shell=True),
-                call('sudo systemctl unmask macsec@0.service', shell=True),
-                call('sudo systemctl enable macsec@0.service', shell=True),
-                call('sudo systemctl start macsec@0.service', shell=True),
-                call('sudo systemctl unmask macsec@1.service', shell=True),
-                call('sudo systemctl enable macsec@1.service', shell=True),
-                call('sudo systemctl start macsec@1.service', shell=True)
+                call(['sudo', 'systemctl', 'unmask', 'bgp@0.service']),
+                call(['sudo', 'systemctl', 'enable', 'bgp@0.service']),
+                call(['sudo', 'systemctl', 'start', 'bgp@0.service']),
+                call(['sudo', 'systemctl', 'unmask', 'bgp@1.service']),
+                call(['sudo', 'systemctl', 'enable', 'bgp@1.service']),
+                call(['sudo', 'systemctl', 'start', 'bgp@1.service']),
+                call(['sudo', 'systemctl', 'unmask', 'teamd@0.service']),
+                call(['sudo', 'systemctl', 'enable', 'teamd@0.service']),
+                call(['sudo', 'systemctl', 'start', 'teamd@0.service']),
+                call(['sudo', 'systemctl', 'unmask', 'teamd@1.service']),
+                call(['sudo', 'systemctl', 'enable', 'teamd@1.service']),
+                call(['sudo', 'systemctl', 'start', 'teamd@1.service']),
+                call(['sudo', 'systemctl', 'unmask', 'lldp.service']),
+                call(['sudo', 'systemctl', 'enable', 'lldp.service']),
+                call(['sudo', 'systemctl', 'start', 'lldp.service']),
+                call(['sudo', 'systemctl', 'unmask', 'lldp@0.service']),
+                call(['sudo', 'systemctl', 'enable', 'lldp@0.service']),
+                call(['sudo', 'systemctl', 'start', 'lldp@0.service']),
+                call(['sudo', 'systemctl', 'unmask', 'lldp@1.service']),
+                call(['sudo', 'systemctl', 'enable', 'lldp@1.service']),
+                call(['sudo', 'systemctl', 'start', 'lldp@1.service']),
+                call(['sudo', 'systemctl', 'unmask', 'macsec@0.service']),
+                call(['sudo', 'systemctl', 'enable', 'macsec@0.service']),
+                call(['sudo', 'systemctl', 'start', 'macsec@0.service']),
+                call(['sudo', 'systemctl', 'unmask', 'macsec@1.service']),
+                call(['sudo', 'systemctl', 'enable', 'macsec@1.service']),
+                call(['sudo', 'systemctl', 'start', 'macsec@1.service'])
             ],
             "daemon_reload_subprocess_call": [
-                call("sudo systemctl daemon-reload", shell=True),
+                call(["sudo", "systemctl", "daemon-reload"]),
             ],
             "popen_attributes": {
                 'communicate.return_value': ('output', 'error')