Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Porting #51074 to master #54613

Merged
merged 9 commits into from
Jan 2, 2020
Merged

[master] Porting #51074 to master #54613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e95bdc
Porting PR #51074 to 2019.2.1
garethgreenaway Sep 19, 2019
05983ce
Add disk test for fat argument
Ch3LL Dec 3, 2019
e9f0e00
Merge pull request #3 from Ch3LL/add_disk_test
garethgreenaway Dec 3, 2019
865e59b
Merge branch 'master' into 2019_2_1_port_51074
Ch3LL Dec 3, 2019
9437276
Fix mock tuple call_args_list
Ch3LL Dec 3, 2019
9bc7cef
Merge branch 'master' into 2019_2_1_port_51074
Ch3LL Dec 3, 2019
8e9bfac
Merge pull request #4 from Ch3LL/add_disk_test
garethgreenaway Dec 3, 2019
008cf0e
Merge branch 'master' into 2019_2_1_port_51074
Ch3LL Dec 3, 2019
b74465f
Merge branch 'master' into 2019_2_1_port_51074
Ch3LL Dec 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions salt/modules/disk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ def format_(device,
fs_type='ext4',
inode_size=None,
lazy_itable_init=None,
fat=None,
force=False):
'''
Format a filesystem onto a device
Expand Down Expand Up @@ -449,6 +450,10 @@ def format_(device,

This option is only enabled for ext filesystems

fat
FAT size option. Can be 12, 16 or 32, and can only be used on
fat or vfat filesystems.

force
Force mke2fs to create a filesystem, even if the specified device is
not a partition on a block special device. This option is only enabled
Expand All @@ -471,6 +476,9 @@ def format_(device,
if lazy_itable_init is not None:
if fs_type[:3] == 'ext':
cmd.extend(['-E', 'lazy_itable_init={0}'.format(lazy_itable_init)])
if fat is not None and fat in (12, 16, 32):
if fs_type[-3:] == 'fat':
cmd.extend(['-F', fat])
if force:
if fs_type[:3] == 'ext':
cmd.append('-F')
Expand Down
13 changes: 13 additions & 0 deletions tests/unit/modules/test_disk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,19 @@ def test_format(self):
patch('salt.utils.path.which', MagicMock(return_value=True)):
self.assertEqual(disk.format_(device), True)

def test_fat_format(self):
'''
unit tests for disk.format when using fat argument
'''
device = '/dev/sdX1'
expected = ['mkfs', '-t', 'fat', '-F', 12, '/dev/sdX1']
mock = MagicMock(return_value=0)
with patch.dict(disk.__salt__, {'cmd.retcode': mock}),\
patch('salt.utils.path.which', MagicMock(return_value=True)):
self.assertEqual(disk.format_(device, fs_type='fat', fat=12), True)
args, kwargs = mock.call_args_list[0]
assert expected == args[0]

@skipIf(not salt.utils.path.which('lsblk') and not salt.utils.path.which('df'),
'lsblk or df not found')
def test_fstype(self):
Expand Down