Skip to content

Commit 28db41d

Browse files
author
Ashwin Srinivasan
committed
Filled out init files in mocked libs to prevent unintentional module hiding
1 parent 36ab2f8 commit 28db41d

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from . import ssd_generic # noqa F401
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from . import ssd # noqa F401

tests/ssdutil_test.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from unittest.mock import patch, MagicMock
44
sys.modules['sonic_platform'] = MagicMock()
55
sys.modules['argparse'] = MagicMock()
6+
sys.modules['subprocess'] = MagicMock()
67

78
import ssdutil.main as ssdutil # noqa: E402
89

@@ -58,6 +59,17 @@ class TestSsdutil:
5859

5960
@patch('sonic_py_common.device_info.get_paths_to_platform_and_hwsku_dirs', MagicMock(return_value=("test_path", ""))) # noqa: E501
6061
@patch('os.geteuid', MagicMock(return_value=0))
61-
def test_happy_path(self):
62+
@patch('builtins.print')
63+
def test_sonic_storage_path(self, mock_print):
6264

6365
ssdutil.ssdutil()
66+
assert mock_print.call_count == 6
67+
68+
@patch('sonic_py_common.device_info.get_paths_to_platform_and_hwsku_dirs', MagicMock(return_value=("test_path", ""))) # noqa: E501
69+
@patch('sonic_platform_base.sonic_storage.ssd', MagicMock(side_effect=ImportError())) # noqa: E501
70+
@patch('os.geteuid', MagicMock(return_value=0))
71+
@patch('builtins.print')
72+
def test_sonic_ssd_path(self, mock_print):
73+
74+
ssdutil.ssdutil()
75+
assert mock_print.call_count == 6

0 commit comments

Comments
 (0)