x/bareon
Code Issues Proposed changes

[IBP] remove '-F' flag from resize2fs command

Browse Source 
'-F' flag is unnecessary and causes failures in case of
using vagrant environment.

Change-Id: I038bae98585fe72066e04898d7b4bae18b343388
Closes-Bug: #1512983
This commit is contained in:
Sylwester Brzeczkowski 2015-11-05 14:25:24 +01:00
parent 9da73b497b
commit 7027b9c31f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuel_agent/tests/test_build_utils.py
View File

@ -301,7 +301,7 @@ class BuildUtilsTestCase(unittest2.TestCase):
mock_open.assert_called_once_with('file', 'rwb+')
file_handle_mock.truncate.assert_called_once_with(1 * 2)
expected_mock_exec_calls = [mock.call('e2fsck', '-y', '-f', 'file'),
mock.call('resize2fs', '-F', '-M', 'file')]
mock.call('resize2fs', '-M', 'file')]
mock_parse.assert_called_once_with('dumpe2fs', 'file')
self.assertEqual(expected_mock_exec_calls, mock_exec.call_args_list)

2
fuel_agent/utils/build.py
View File

@ -298,7 +298,7 @@ def deattach_loop(loop, check_exit_code=[0]):
def shrink_sparse_file(filename):
"""Shrinks file to its size of actual data. Only ext fs are supported."""
utils.execute('e2fsck', '-y', '-f', filename)
utils.execute('resize2fs', '-F', '-M', filename)
utils.execute('resize2fs', '-M', filename)
data = hu.parse_simple_kv('dumpe2fs', filename)
block_count = int(data['block count'])
block_size = int(data['block size'])