Merge pull request #249 from bridadan/test_cleanup

Get tests passing on Windows (and other cleanup)

Author: theotherjimmy

mbed_lstools/platform_database.py

@@ -267,7 +267,8 @@ def __init__(self, database_files, primary_database=None):
         self._keys = set()
         for db in database_files:
             try:
-                new_db = json.load(open(db, encoding="utf-8"))
+                with open(db, encoding="utf-8") as db_json_file:
+                    new_db = json.load(db_json_file)
                 duplicates = set(self._keys).intersection(set(new_db.keys()))
                 if duplicates:
                     logger.warning(

test/basic.py

@@ -47,7 +47,7 @@ def setUp(self):
     def tearDown(self):
         pass
 
-    def test_list_mbeds(self):
+    def test_list_mbeds_valid_platform(self):
         self.base.return_value = [{'mount_point': 'dummy_mount_point',
                                    'target_id_usb_id': u'0240DEADBEEF',
                                    'serial_port': "dummy_serial_port"},
@@ -67,7 +67,7 @@ def test_list_mbeds(self):
         self.assertEqual(to_check[0]['target_id'], "0241BEEFDEAD")
         self.assertEqual(to_check[0]['platform_name'], 'foo_target')
 
-    def test_list_mbeds(self):
+    def test_list_mbeds_invalid_platform(self):
         self.base.return_value = [{'mount_point': 'dummy_mount_point',
                                    'target_id_usb_id': u'not_in_target_db',
                                    'serial_port': "dummy_serial_port"}]

test/listing.py

@@ -17,10 +17,11 @@
 '''
 
 import unittest
+import sys
+import os
 from mock import patch
 from mbed_lstools.linux import MbedLsToolsLinuxGeneric
 
-
 class LinuxPortTestCase(unittest.TestCase):
     ''' Basic test cases checking trivial asserts
     '''
@@ -79,18 +80,32 @@ def test_get_mount_point_ext(self):
         self.assertEqual('/mnt/DAPLINK__', mount_dict['/dev/sdi'])
 
     def find_candidates_with_patch(self, mount_list, link_dict, listdir_dict):
+        if not getattr(sys.modules['os'], 'readlink', None):
+            sys.modules['os'].readlink = None
+
         with patch('mbed_lstools.linux.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc,\
              patch('os.readlink') as _readlink,\
              patch('os.listdir') as _listdir,\
+             patch('mbed_lstools.linux.abspath') as _abspath,\
              patch('mbed_lstools.linux.isdir') as _isdir:
             _isdir.return_value = True
             _cliproc.return_value = (b'\n'.join(mount_list), None, 0)
             def do_readlink(link):
+                # Fix for testing on Windows
+                link = link.replace('\\', '/')
                 return link_dict[link]
             _readlink.side_effect = do_readlink
             def do_listdir(dir):
+                # Fix for testing on Windows
+                dir = dir.replace('\\', '/')
                 return listdir_dict[dir]
             _listdir.side_effect = do_listdir
+            def do_abspath(dir):
+                _, path = os.path.splitdrive(
+                    os.path.normpath(os.path.join(os.getcwd(), dir)))
+                path = path.replace('\\', '/')
+                return path
+            _abspath.side_effect = do_abspath
             ret_val = self.linux_generic.find_candidates()
             _cliproc.assert_called_once_with('mount')
             return ret_val

test/mbedls_toolsbase.py

@@ -38,31 +38,32 @@ class EmptyPlatformDatabaseTests(unittest.TestCase):
     """
 
     def setUp(self):
-        self.base_db = tempfile.NamedTemporaryFile(prefix='base')
+        self.base_db_path = os.path.join(tempfile.mkdtemp(), '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.name])
+        self.pdb = PlatformDatabase([self.base_db_path])
 
     def tearDown(self):
-        pass
+        self.base_db.close()
 
     def test_broken_database_io(self):
         """Verify that the platform database still works without a
         working backing file
         """
         with patch("mbed_lstools.platform_database.open") as _open:
             _open.side_effect = IOError("Bogus")
-            self.pdb = PlatformDatabase([self.base_db.name])
+            self.pdb = PlatformDatabase([self.base_db_path])
             self.pdb.add("1234", "MYTARGET")
             self.assertEqual(self.pdb.get("1234"), "MYTARGET")
 
     def test_broken_database_bad_json(self):
         """Verify that the platform database still works without a
         working backing file
         """
-        self.base_db.write(b'{{}')
+        self.base_db.write(b'{}')
         self.base_db.seek(0)
-        self.pdb = PlatformDatabase([self.base_db.name])
+        self.pdb = PlatformDatabase([self.base_db_path])
         self.pdb.add("1234", "MYTARGET")
         self.assertEqual(self.pdb.get("1234"), "MYTARGET")
 
@@ -119,20 +120,24 @@ class OverriddenPlatformDatabaseTests(unittest.TestCase):
     """
 
     def setUp(self):
-        self.base_db = tempfile.NamedTemporaryFile(prefix='base')
+        self.temp_dir = tempfile.mkdtemp()
+        self.base_db_path = os.path.join(self.temp_dir, 'base')
+        self.base_db = open(self.base_db_path, 'w+b')
         self.base_db.write(json.dumps(dict([('0123', 'Base_Platform')])).
                            encode('utf-8'))
         self.base_db.seek(0)
-        self.overriding_db = tempfile.NamedTemporaryFile(prefix='overriding')
+        self.overriding_db_path = os.path.join(self.temp_dir, 'overriding')
+        self.overriding_db = open(self.overriding_db_path, 'w+b')
         self.overriding_db.write(b'{}')
         self.overriding_db.seek(0)
-        self.pdb = PlatformDatabase([self.overriding_db.name, self.base_db.name],
-                                    primary_database=self.overriding_db.name)
+        self.pdb = PlatformDatabase([self.overriding_db_path, self.base_db_path],
+                                    primary_database=self.overriding_db_path)
         self.base_db.seek(0)
         self.overriding_db.seek(0)
 
     def tearDown(self):
-        pass
+        self.base_db.close()
+        self.overriding_db.close()
 
     def assertBaseUnchanged(self):
         """Assert that the base database has not changed
@@ -170,8 +175,8 @@ def test_load_override(self):
         self.overriding_db.write(json.dumps(dict([('0123', 'Overriding_Platform')])).
                                  encode('utf-8'))
         self.overriding_db.seek(0)
-        self.pdb = PlatformDatabase([self.overriding_db.name, self.base_db.name],
-                                    primary_database=self.overriding_db.name)
+        self.pdb = PlatformDatabase([self.overriding_db_path, self.base_db_path],
+                                    primary_database=self.overriding_db_path)
         self.assertIn(('0123', 'Overriding_Platform'), list(self.pdb.items()))
         self.assertEqual(set(self.pdb.all_ids()), set(['0123']))
         self.assertEqual(self.pdb.get('0123'), 'Overriding_Platform')
@@ -231,14 +236,16 @@ def setUp(self):
         self.mocked_lock = patch('mbed_lstools.platform_database.InterProcessLock', spec=True).start()
         self.acquire = self.mocked_lock.return_value.acquire
         self.release = self.mocked_lock.return_value.release
-        self.base_db = tempfile.NamedTemporaryFile(prefix='base')
+
+        self.base_db_path = os.path.join(tempfile.mkdtemp(), '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.name])
+        self.pdb = PlatformDatabase([self.base_db_path])
         self.addCleanup(patch.stopall)
 
     def tearDown(self):
-        pass
+        self.base_db.close()
 
     def test_no_update(self):
         """Test that no locks are used when no modifications are specified