Skip to content

Commit 3cc04be

Browse files
committed
Fixing Linux mock testing on Windows
1 parent 6463a89 commit 3cc04be

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

test/os_linux_generic.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
'''
1818

1919
import unittest
20+
import sys
2021
from mock import patch
2122
from mbed_lstools.linux import MbedLsToolsLinuxGeneric
2223

@@ -79,16 +80,23 @@ def test_get_mount_point_ext(self):
7980
self.assertEqual('/mnt/DAPLINK__', mount_dict['/dev/sdi'])
8081

8182
def find_candidates_with_patch(self, mount_list, link_dict, listdir_dict):
83+
if not getattr(sys.modules['os'], 'readlink', None):
84+
sys.modules['os'].readlink = None
85+
8286
with patch('mbed_lstools.linux.MbedLsToolsLinuxGeneric._run_cli_process') as _cliproc,\
8387
patch('os.readlink') as _readlink,\
8488
patch('os.listdir') as _listdir,\
8589
patch('mbed_lstools.linux.isdir') as _isdir:
8690
_isdir.return_value = True
8791
_cliproc.return_value = (b'\n'.join(mount_list), None, 0)
8892
def do_readlink(link):
93+
# Fix for testing on Windows
94+
link = link.replace('\\', '/')
8995
return link_dict[link]
9096
_readlink.side_effect = do_readlink
9197
def do_listdir(dir):
98+
# Fix for testing on Windows
99+
dir = dir.replace('\\', '/')
92100
return listdir_dict[dir]
93101
_listdir.side_effect = do_listdir
94102
ret_val = self.linux_generic.find_candidates()

0 commit comments

Comments
 (0)