From 11d8d9e94cab2933b505949644700919c633a0fb Mon Sep 17 00:00:00 2001 From: Mahesh Maddikayala Date: Mon, 28 Dec 2020 17:40:35 +0000 Subject: [PATCH 1/2] mock os.geteuid --- tests/pfcwd_test.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/pfcwd_test.py b/tests/pfcwd_test.py index afbd1d0a74..1a46a964e4 100644 --- a/tests/pfcwd_test.py +++ b/tests/pfcwd_test.py @@ -3,6 +3,8 @@ import sys from click.testing import CliRunner +from unittest.mock import patch + from utilities_common.db import Db from .pfcwd_input.pfcwd_test_vectors import * @@ -78,7 +80,8 @@ def executor(self, testcase): if 'rc_output' in input: assert result.output == input['rc_output'] - def test_pfcwd_start_ports_valid(self): + @patch('pfcwd.main.os') + def test_pfcwd_start_ports_valid(self, mock_os): # pfcwd start --action drop --restoration-time 200 Ethernet0 200 import pfcwd.main as pfcwd runner = CliRunner() @@ -92,6 +95,7 @@ def test_pfcwd_start_ports_valid(self): print(result.output) assert result.output == pfcwd_show_config_output + mock_os.geteuid.return_value = 0 result = runner.invoke( pfcwd.cli.commands["start"], [ @@ -112,7 +116,8 @@ def test_pfcwd_start_ports_valid(self): assert result.exit_code == 0 assert result.output == pfcwd_show_start_config_output_pass - def test_pfcwd_start_actions(self): + @patch('pfcwd.main.os') + def test_pfcwd_start_actions(self, mock_os): # pfcwd start --action fwd --restoration-time 200 Ethernet0 200 import pfcwd.main as pfcwd runner = CliRunner() @@ -126,6 +131,7 @@ def test_pfcwd_start_actions(self): print(result.output) assert result.output == pfcwd_show_config_output + mock_os.geteuid.return_value = 0 result = runner.invoke( pfcwd.cli.commands["start"], [ @@ -267,7 +273,8 @@ def test_pfcwd_config_with_ports(self): assert result.exit_code == 0 assert result.output == show_pfcwd_config_with_ports - def test_pfcwd_start_ports_masic_valid(self): + @patch('pfcwd.main.os') + def test_pfcwd_start_ports_masic_valid(self, mock_os): # pfcwd start --action forward --restoration-time 200 Ethernet0 200 import pfcwd.main as pfcwd runner = CliRunner() @@ -280,6 +287,7 @@ def test_pfcwd_start_ports_masic_valid(self): print(result.output) assert result.output == show_pfc_config_all + mock_os.geteuid.return_value = 0 result = runner.invoke( pfcwd.cli.commands["start"], [ @@ -300,7 +308,8 @@ def test_pfcwd_start_ports_masic_valid(self): assert result.exit_code == 0 assert result.output == show_pfc_config_start_pass - def test_pfcwd_start_actions_masic(self): + @patch('pfcwd.main.os') + def test_pfcwd_start_actions_masic(self, mock_os): # pfcwd start --action drop --restoration-time 200 Ethernet0 200 import pfcwd.main as pfcwd runner = CliRunner() @@ -313,6 +322,7 @@ def test_pfcwd_start_actions_masic(self): print(result.output) assert result.output == show_pfc_config_all + mock_os.geteuid.return_value = 0 result = runner.invoke( pfcwd.cli.commands["start"], [ From 15cda733bdd995b0ae25b9f25cb1bcdb3b0ee809 Mon Sep 17 00:00:00 2001 From: Mahesh Maddikayala Date: Mon, 28 Dec 2020 19:47:11 +0000 Subject: [PATCH 2/2] rearrange imports --- tests/pfcwd_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/pfcwd_test.py b/tests/pfcwd_test.py index 1a46a964e4..b8d19edd57 100644 --- a/tests/pfcwd_test.py +++ b/tests/pfcwd_test.py @@ -1,9 +1,9 @@ import imp import os import sys +from unittest.mock import patch from click.testing import CliRunner -from unittest.mock import patch from utilities_common.db import Db