womax/python-glanceclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace file with open, which is Python 3 compatible

Browse Source 
Change-Id: I471ae9b372f88a508d4654b1a18c6da90397a828
This commit is contained in:
Alex Gaynor
2014-02-13 06:57:00 -08:00
parent b8a850c5b3
commit d465d60867
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_shell.py
+10 -10
View File
@@ -137,7 +137,7 @@ class ShellCacheSchemaTest(utils.TestCase):
return Args(args)
@mock.patch('__builtin__.file', new=mock.mock_open(), create=True)
@mock.patch('__builtin__.open', new=mock.mock_open(), create=True)
def test_cache_schema_gets_when_not_exists(self):
mocked_path_exists_result_lst = [True, False]
os.path.exists.side_effect = \
@@ -150,12 +150,12 @@ class ShellCacheSchemaTest(utils.TestCase):
self.shell._cache_schema(self._make_args(options),
home_dir=self.cache_dir)
self.assertEqual(4, file.mock_calls.__len__())
self.assertEqual(mock.call(self.cache_file, 'w'), file.mock_calls[0])
self.assertEqual(4, open.mock_calls.__len__())
self.assertEqual(mock.call(self.cache_file, 'w'), open.mock_calls[0])
self.assertEqual(mock.call().write(json.dumps(self.schema_dict)),
file.mock_calls[2])
open.mock_calls[2])
@mock.patch('__builtin__.file', new=mock.mock_open(), create=True)
@mock.patch('__builtin__.open', new=mock.mock_open(), create=True)
def test_cache_schema_gets_when_forced(self):
os.path.exists.return_value = True
@@ -166,12 +166,12 @@ class ShellCacheSchemaTest(utils.TestCase):
self.shell._cache_schema(self._make_args(options),
home_dir=self.cache_dir)
self.assertEqual(4, file.mock_calls.__len__())
self.assertEqual(mock.call(self.cache_file, 'w'), file.mock_calls[0])
self.assertEqual(4, open.mock_calls.__len__())
self.assertEqual(mock.call(self.cache_file, 'w'), open.mock_calls[0])
self.assertEqual(mock.call().write(json.dumps(self.schema_dict)),
file.mock_calls[2])
open.mock_calls[2])
@mock.patch('__builtin__.file', new=mock.mock_open(), create=True)
@mock.patch('__builtin__.open', new=mock.mock_open(), create=True)
def test_cache_schema_leaves_when_present_not_forced(self):
os.path.exists.return_value = True
@@ -185,4 +185,4 @@ class ShellCacheSchemaTest(utils.TestCase):
os.path.exists.assert_any_call(self.cache_dir)
os.path.exists.assert_any_call(self.cache_file)
self.assertEqual(2, os.path.exists.call_count)
self.assertEqual(0, file.mock_calls.__len__())
self.assertEqual(0, open.mock_calls.__len__())