Unit db mock during is_sata30orless test

Signed-off-by: Vinit Chacharia <vinit.chacharia@canonical.com>

Author: vinitChacharia

ceph-osd/hooks/utils.py

@@ -339,8 +339,8 @@ def should_enable_discard(devices):
 def is_sata30orless(device):
     db = unitdata.kv()
     key = '%s_is_sata30orless' % str(device)
-    if db.get(key) is not None:
-        value = db.get(key)
+    value = db.get(key)
+    if value is not None:
         log('is_sata30orless: Using cached value %s' % value, level='DEBUG')
         return value
 

ceph-osd/unit_tests/test_ceph_utils.py

@@ -15,15 +15,13 @@
 
 import unittest
 
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
 
 with patch('charmhelpers.contrib.hardening.harden.harden') as mock_dec:
     mock_dec.side_effect = (lambda *dargs, **dkwargs: lambda f:
                             lambda *args, **kwargs: f(*args, **kwargs))
     import utils
 
-from charmhelpers.core import unitdata
-
 
 class CephUtilsTestCase(unittest.TestCase):
     def setUp(self):
@@ -89,49 +87,64 @@ def test_should_enable_discard_no(self, mock_is_sata30orless,
         self.assertEqual(ret, False)
 
     @patch('subprocess.check_output')
-    def test_is_sata30orless_sata31(self, mock_subprocess_check_output):
+    @patch('charmhelpers.core.unitdata.kv')
+    def test_is_sata30orless_sata31(self, mock_db,
+                                    mock_subprocess_check_output):
         extcmd_output = (b'supressed text\nSATA Version is:  '
                          b'SATA 3.1, 6.0 Gb/s (current: 6.0 Gb/s)\n'
                          b'supressed text\n\n')
         mock_subprocess_check_output.return_value = extcmd_output
-        db = unitdata.kv()
+        mock_db_instance = MagicMock()
+        mock_db.return_value = mock_db_instance
         key = '/dev/sda_is_sata30orless'
-        if db.get(key) is None:
+        mock_db_instance.return_value = False
+        if mock_db_instance.get(key) is None:
             ret = utils.is_sata30orless('/dev/sda')
             mock_subprocess_check_output.assert_called()
             self.assertEqual(ret, False)
+            mock_db_instance.set.assert_called_with(key, False)
         else:
             ret = utils.is_sata30orless('/dev/sda')
             mock_subprocess_check_output.assert_not_called()
 
     @patch('subprocess.check_output')
-    def test_is_sata30orless_sata30(self, mock_subprocess_check_output):
+    @patch('charmhelpers.core.unitdata.kv')
+    def test_is_sata30orless_sata30(self, mock_db,
+                                    mock_subprocess_check_output):
         extcmd_output = (b'supressed text\nSATA Version is:  '
                          b'SATA 3.0, 6.0 Gb/s (current: 6.0 Gb/s)\n'
                          b'supressed text\n\n')
         mock_subprocess_check_output.return_value = extcmd_output
-        db = unitdata.kv()
+        mock_db_instance = MagicMock()
+        mock_db.return_value = mock_db_instance
         key = '/dev/sda_is_sata30orless'
-        if db.get(key) is None:
+        mock_db_instance.get.return_value = None
+        if mock_db_instance.get(key) is None:
             ret = utils.is_sata30orless('/dev/sda')
             mock_subprocess_check_output.assert_called()
             self.assertEqual(ret, True)
+            mock_db_instance.set.assert_called_with(key, True)
         else:
             ret = utils.is_sata30orless('/dev/sda')
             mock_subprocess_check_output.assert_not_called()
 
     @patch('subprocess.check_output')
-    def test_is_sata30orless_sata26(self, mock_subprocess_check_output):
+    @patch('charmhelpers.core.unitdata.kv')
+    def test_is_sata30orless_sata26(self, mock_db,
+                                    mock_subprocess_check_output):
         extcmd_output = (b'supressed text\nSATA Version is:  '
                          b'SATA 2.6, 3.0 Gb/s (current: 3.0 Gb/s)\n'
                          b'supressed text\n\n')
         mock_subprocess_check_output.return_value = extcmd_output
-        db = unitdata.kv()
+        mock_db_instance = MagicMock()
+        mock_db.return_value = mock_db_instance
         key = '/dev/sda_is_sata30orless'
-        if db.get(key) is None:
+        mock_db_instance.get.return_value = None
+        if mock_db_instance.get(key) is None:
             ret = utils.is_sata30orless('/dev/sda')
             mock_subprocess_check_output.assert_called()
             self.assertEqual(ret, True)
+            mock_db_instance.set.assert_called_with(key, True)
         else:
             ret = utils.is_sata30orless('/dev/sda')
             mock_subprocess_check_output.assert_not_called()