From c235350565e4598b099759f5192fe43fa1dccb15 Mon Sep 17 00:00:00 2001
From: Ashwin Srinivasan <assrinivasan@microsoft.com>
Date: Tue, 14 May 2024 04:08:55 +0000
Subject: [PATCH] Renamed SSD and EMMC UTs per naming convention

---
 tests/{ssd_emmc_test.py => test_emmc.py}   | 19 +++++++++++++------
 tests/{ssd_generic_test.py => test_ssd.py} |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)
 rename tests/{ssd_emmc_test.py => test_emmc.py} (67%)
 rename tests/{ssd_generic_test.py => test_ssd.py} (99%)

diff --git a/tests/ssd_emmc_test.py b/tests/test_emmc.py
similarity index 67%
rename from tests/ssd_emmc_test.py
rename to tests/test_emmc.py
index 4a6a61e4d..683c16ef5 100644
--- a/tests/ssd_emmc_test.py
+++ b/tests/test_emmc.py
@@ -1,10 +1,15 @@
 import sys
 if sys.version_info.major == 3:
-    from unittest.mock import mock_open, patch
+    from unittest import mock
 else:
-    from mock import mock_open, patch
+    import mock
 
-from sonic_platform_base.sonic_ssd.ssd_emmc import EmmcUtil
+import pdb; pdb.set_trace()
+
+from sonic_platform_base.sonic_storage.emmc import EmmcUtil
+
+sys.modules['sonic_py_common'] = mock.MagicMockMock()
+sys.modules['sonic_platform_base.sonic_storage.storage_devices'] = mock.Mock()
 
 mocked_files = {
     '/sys/block/emmctest/device/enhanced_area_offset': '0',
@@ -17,7 +22,7 @@
 
 
 def build_mocked_sys_fs_open(files):
-    mocks = dict([(fname, mock_open(read_data=cnt).return_value)
+    mocks = dict([(fname, mock.mock_open(read_data=cnt).return_value)
                  for fname, cnt in files.items()])
 
     def mopen(fname):
@@ -28,9 +33,11 @@ def mopen(fname):
     return mopen
 
 
-class TestSsdEMMC:
+class TestEMMC:
+
+    @mock.patch('builtins.open', new=build_mocked_sys_fs_open(mocked_files))
+    @mock.patch('sonic_py_common', mock.MagicMock())
 
-    @patch('builtins.open', new=build_mocked_sys_fs_open(mocked_files))
     def test_check(self, *args):
         util = EmmcUtil('emmctest')
 
diff --git a/tests/ssd_generic_test.py b/tests/test_ssd.py
similarity index 99%
rename from tests/ssd_generic_test.py
rename to tests/test_ssd.py
index 338e27fff..17e64a92a 100644
--- a/tests/ssd_generic_test.py
+++ b/tests/test_ssd.py
@@ -5,7 +5,7 @@
 else:
     import mock
 
-from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil
+from sonic_platform_base.sonic_storage.ssd import SsdUtil
 
 output_nvme_ssd = """smartctl 7.2 2020-12-30 r5155 [x86_64-linux-5.10.0-8-2-amd64] (local build)
 Copyright (C) 2002-20, Bruce Allen, Christian Franke, www.smartmontools.org