Merge ~chad.smith/curtin:ubuntu/devel into curtin:ubuntu/devel

Proposed by Chad Smith on 2018-08-20
Status: Merged
Merged at revision: 724586bda1ebc0fabb880a512d3b6eb53d68f1b0
Proposed branch: ~chad.smith/curtin:ubuntu/devel
Merge into: curtin:ubuntu/devel
Diff against target: 40 lines (+9/-3)
2 files modified
debian/changelog (+3/-2)
tests/unittests/test_block_zfs.py (+6/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2018-08-20
curtin developers 2018-08-20 Pending
Review via email: mp+353429@code.launchpad.net

Commit message

new-upstream-snapshot sync for Cosmic release

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index a9e5d53..6e3bffb 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,4 +1,4 @@
6-curtin (18.1-49-g72b02c21-0ubuntu1) cosmic; urgency=medium
7+curtin (18.1-50-g2d9b2c6f-0ubuntu1) cosmic; urgency=medium
8
9 * New upstream snapshot.
10 - clear-holders: handle missing zpool/zfs tools when wiping
11@@ -6,8 +6,9 @@ curtin (18.1-49-g72b02c21-0ubuntu1) cosmic; urgency=medium
12 - vmtest: enable persistent journal and collect at boot time
13 - Add timing and logging functions.
14 - parse_dpkg_version: support non-numeric in version string.
15+ - Don't allow reads of /proc and modprobe zfs through
16
17- -- Chad Smith <chad.smith@canonical.com> Fri, 17 Aug 2018 17:23:59 -0600
18+ -- Chad Smith <chad.smith@canonical.com> Mon, 20 Aug 2018 09:22:06 -0600
19
20 curtin (18.1-44-g2b12b8fc-0ubuntu1) cosmic; urgency=medium
21
22diff --git a/tests/unittests/test_block_zfs.py b/tests/unittests/test_block_zfs.py
23index ca8f118..c18f6a3 100644
24--- a/tests/unittests/test_block_zfs.py
25+++ b/tests/unittests/test_block_zfs.py
26@@ -385,8 +385,13 @@ class TestBlockZfsAssertZfsSupported(CiTestCase):
27 self.add_patch('curtin.block.zfs.util.subp', 'mock_subp')
28 self.add_patch('curtin.block.zfs.util.get_platform_arch', 'mock_arch')
29 self.add_patch('curtin.block.zfs.util.lsb_release', 'mock_release')
30- self.mock_release.return_value = {'codename': 'xenial'}
31+ self.add_patch('curtin.block.zfs.util.which', 'mock_which')
32+ self.add_patch('curtin.block.zfs.get_supported_filesystems',
33+ 'mock_supfs')
34 self.mock_arch.return_value = 'x86_64'
35+ self.mock_release.return_value = {'codename': 'xenial'}
36+ self.mock_supfs.return_value = ['zfs']
37+ self.mock_which.return_value = True
38
39 def test_supported_arch(self):
40 self.assertTrue(zfs.zfs_supported())

Subscribers

People subscribed via source and target branches