Merge pull request #66 from bridadan/fix_remove_all_mocks

Fix remove all mocks call

Author: theotherjimmy

packages/mbed-ls/test/mbedls_toolsbase.py

@@ -43,7 +43,7 @@ class BasicTestCase(unittest.TestCase):
     """
 
     def setUp(self):
-        self.base = DummyLsTools()
+        self.base = DummyLsTools(force_mock=True)
 
     def tearDown(self):
         pass

src/mbed_os_tools/detect/platform_database.py

@@ -508,13 +508,16 @@ def remove(self, id, permanent=False, device_type="daplink", verbose_data=False)
         logger.debug("Trying remove of %s", id)
         if id is "*" and device_type in self._dbs[self._prim_db]:
             self._dbs[self._prim_db][device_type] = {}
-        for db in self._dbs.values():
-            if device_type in db and id in db[device_type]:
-                logger.debug("Removing id...")
-                removed = db[device_type][id]
-                del db[device_type][id]
-                self._keys[device_type].remove(id)
-                if permanent:
-                    self._update_db()
+            if permanent:
+                self._update_db()
+        else:
+            for db in self._dbs.values():
+                if device_type in db and id in db[device_type]:
+                    logger.debug("Removing id...")
+                    removed = db[device_type][id]
+                    del db[device_type][id]
+                    self._keys[device_type].remove(id)
+                    if permanent:
+                        self._update_db()
 
-                return _modify_data_format(removed, verbose_data)
+                    return _modify_data_format(removed, verbose_data)

test/detect/mbedls_toolsbase.py

@@ -41,7 +41,7 @@ class BasicTestCase(unittest.TestCase):
     """
 
     def setUp(self):
-        self.base = DummyLsTools()
+        self.base = DummyLsTools(force_mock=True)
 
     def tearDown(self):
         pass
@@ -264,6 +264,7 @@ def test_mock_manufacture_ids_star(self):
         self.assertEqual(None, self.base.plat_db.get("0342"))
         self.assertEqual(None, self.base.plat_db.get("0343"))
 
+
     def test_update_device_from_fs_mid_unmount(self):
         dummy_mount = 'dummy_mount'
         device = {

test/detect/platform_database.py

@@ -19,6 +19,7 @@
 import logging
 import tempfile
 import json
+import shutil
 from mock import patch, MagicMock, DEFAULT
 from io import StringIO
 
@@ -35,14 +36,16 @@ class EmptyPlatformDatabaseTests(unittest.TestCase):
     """
 
     def setUp(self):
-        self.base_db_path = os.path.join(tempfile.mkdtemp(), 'base')
+        self.tempd_dir = tempfile.mkdtemp()
+        self.base_db_path = os.path.join(self.tempd_dir, 'base')
         self.base_db = open(self.base_db_path, 'w+b')
         self.base_db.write(b'{}')
         self.base_db.seek(0)
         self.pdb = PlatformDatabase([self.base_db_path])
 
     def tearDown(self):
         self.base_db.close()
+        shutil.rmtree(self.tempd_dir)
 
     def test_broken_database_io(self):
         """Verify that the platform database still works without a
@@ -123,6 +126,60 @@ def test_remove(self):
         self.assertEqual(self.pdb.remove('4753', permanent=False), 'Test_Platform')
         self.assertEqual(self.pdb.get('4753', None), None)
 
+    def test_remove_all(self):
+        """Test that multiple entries can be removed at once
+        """
+        self.assertEqual(self.pdb.get('4753', None), None)
+        self.assertEqual(self.pdb.get('4754', None), None)
+        self.pdb.add('4753', 'Test_Platform1', permanent=False)
+        self.pdb.add('4754', 'Test_Platform2', permanent=False)
+        self.assertEqual(self.pdb.get('4753', None), 'Test_Platform1')
+        self.assertEqual(self.pdb.get('4754', None), 'Test_Platform2')
+        self.pdb.remove('*', permanent=False)
+        self.assertEqual(self.pdb.get('4753', None), None)
+        self.assertEqual(self.pdb.get('4754', None), None)
+
+    def test_remove_permanent(self):
+        """Test that once something is removed permanently it no longer shows up
+        when queried
+        """
+        self.assertEqual(self.pdb.get('4753', None), None)
+        self.pdb.add('4753', 'Test_Platform', permanent=True)
+        self.assertEqual(self.pdb.get('4753', None), 'Test_Platform')
+
+        # Recreate platform database to simulate rerunning mbedls
+        self.pdb = PlatformDatabase([self.base_db_path])
+        self.assertEqual(self.pdb.get('4753', None), 'Test_Platform')
+        self.assertEqual(self.pdb.remove('4753', permanent=True), 'Test_Platform')
+        self.assertEqual(self.pdb.get('4753', None), None)
+
+        # Recreate platform database to simulate rerunning mbedls
+        self.pdb = PlatformDatabase([self.base_db_path])
+        self.assertEqual(self.pdb.get('4753', None), None)
+
+    def test_remove_all_permanent(self):
+        """Test that multiple entries can be removed permanently at once
+        """
+        self.assertEqual(self.pdb.get('4753', None), None)
+        self.assertEqual(self.pdb.get('4754', None), None)
+        self.pdb.add('4753', 'Test_Platform1', permanent=True)
+        self.pdb.add('4754', 'Test_Platform2', permanent=True)
+        self.assertEqual(self.pdb.get('4753', None), 'Test_Platform1')
+        self.assertEqual(self.pdb.get('4754', None), 'Test_Platform2')
+
+        # Recreate platform database to simulate rerunning mbedls
+        self.pdb = PlatformDatabase([self.base_db_path])
+        self.assertEqual(self.pdb.get('4753', None), 'Test_Platform1')
+        self.assertEqual(self.pdb.get('4754', None), 'Test_Platform2')
+        self.pdb.remove('*', permanent=True)
+        self.assertEqual(self.pdb.get('4753', None), None)
+        self.assertEqual(self.pdb.get('4754', None), None)
+
+        # Recreate platform database to simulate rerunning mbedls
+        self.pdb = PlatformDatabase([self.base_db_path])
+        self.assertEqual(self.pdb.get('4753', None), None)
+        self.assertEqual(self.pdb.get('4754', None), None)
+
     def test_bogus_add(self):
         """Test that add requires properly formatted platform ids
         """