summaryrefslogtreecommitdiff
path: root/cloudinit/tests
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2018-05-22 10:55:04 -0400
committerScott Moser <smoser@brickies.net>2018-05-22 10:55:04 -0400
commit529d48f69d3784b2314397f5eab9d750ab03cf6a (patch)
tree03e8f08b69b38a9835ffa63edb9ce58450b27289 /cloudinit/tests
parentb4ae0e1fb8a48a83ea325cf032eb1acb196ee31c (diff)
downloadvyos-cloud-init-529d48f69d3784b2314397f5eab9d750ab03cf6a.tar.gz
vyos-cloud-init-529d48f69d3784b2314397f5eab9d750ab03cf6a.zip
cc_mounts: Do not add devices to fstab that are already present.
Do not add new entries to /etc/fstab for devices that already have an existing fstab entry. Resolves: rhbz#1542578
Diffstat (limited to 'cloudinit/tests')
-rw-r--r--cloudinit/tests/helpers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/tests/helpers.py b/cloudinit/tests/helpers.py
index 117a9cfe..07059fd4 100644
--- a/cloudinit/tests/helpers.py
+++ b/cloudinit/tests/helpers.py
@@ -111,12 +111,12 @@ class TestCase(unittest2.TestCase):
super(TestCase, self).setUp()
self.reset_global_state()
- def add_patch(self, target, attr, **kwargs):
+ def add_patch(self, target, attr, *args, **kwargs):
"""Patches specified target object and sets it as attr on test
instance also schedules cleanup"""
if 'autospec' not in kwargs:
kwargs['autospec'] = True
- m = mock.patch(target, **kwargs)
+ m = mock.patch(target, *args, **kwargs)
p = m.start()
self.addCleanup(m.stop)
setattr(self, attr, p)