summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-04-16 11:18:36 -0400
committerGitHub <noreply@github.com>2020-04-16 09:18:36 -0600
commit0c5c736727d0f8e363678fe970d70bb889e3893c (patch)
treeac790bb1906c4fea3b5dfee070707dba22d8e1a1
parent9d7b35ce23aaf8741dd49b16e359c96591be3c76 (diff)
downloadvyos-cloud-init-0c5c736727d0f8e363678fe970d70bb889e3893c.tar.gz
vyos-cloud-init-0c5c736727d0f8e363678fe970d70bb889e3893c.zip
test_mounts: expand happy path test for both happy paths (#319)
-rw-r--r--cloudinit/config/tests/test_mounts.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/cloudinit/config/tests/test_mounts.py b/cloudinit/config/tests/test_mounts.py
index c7dad61a..80b54d0f 100644
--- a/cloudinit/config/tests/test_mounts.py
+++ b/cloudinit/config/tests/test_mounts.py
@@ -1,6 +1,8 @@
# This file is part of cloud-init. See LICENSE file for license information.
from unittest import mock
+import pytest
+
from cloudinit.config.cc_mounts import create_swapfile
@@ -9,8 +11,10 @@ M_PATH = 'cloudinit.config.cc_mounts.'
class TestCreateSwapfile:
+ @pytest.mark.parametrize('fstype', ('xfs', 'btrfs', 'ext4', 'other'))
+ @mock.patch(M_PATH + 'util.get_mount_info')
@mock.patch(M_PATH + 'util.subp')
- def test_happy_path(self, m_subp, tmpdir):
+ def test_happy_path(self, m_subp, m_get_mount_info, fstype, tmpdir):
swap_file = tmpdir.join("swap-file")
fname = str(swap_file)
@@ -18,5 +22,7 @@ class TestCreateSwapfile:
# roughly approximates that
m_subp.side_effect = lambda *args, **kwargs: swap_file.write('')
+ m_get_mount_info.return_value = (mock.ANY, fstype)
+
create_swapfile(fname, '')
assert mock.call(['mkswap', fname]) in m_subp.call_args_list