Merge lp:~wesley-wiedenmeier/curtin/1597923 into lp:~curtin-dev/curtin/trunk

[Wesley Wiedenmeier]

For mkfs.vfat commands, add the flag -I to force the command to work if told to format a whole disk instead of just a partition.

Note, I did not add a whole disk fat filesystem to any of the vmtests, because whole disk formatting is tested quite a bit in storagetests, so it shouldn't really be needed.

[Ryan Harper (raharper)]

Good catch and nice fix + unittest.

Can you add it to say basic vmtest since storagetests hasn't yet landed? We could pick this up until the storagetests end up landing as well.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:401
https://server-team-jenkins.canonical.com/job/curtin-ci/290/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/287/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/290/rebuild

review: Approve (continuous-integration)

[lp:~wesley-wiedenmeier/curtin/1597923]

402. By Wesley Wiedenmeier on 2016-06-30

Added creation of whole disk fat32 filesystem to basic unit test to check for
(LP: 1597923)

[Wesley Wiedenmeier (wesley-wiedenmeier)]

Thanks, I added a whole disk format in on the spare disk in test_basic, so we should be good on verification now.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:402
https://server-team-jenkins.canonical.com/job/curtin-ci/292/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/289/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/292/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

review: Approve

=== modified file 'curtin/block/mkfs.py'
--- curtin/block/mkfs.py	2016-04-14 19:24:47 +0000
+++ curtin/block/mkfs.py	2016-06-30 22:31:57 +0000
@@ -78,6 +78,7 @@
              "swap": "--uuid"},
     "force": {"btrfs": "--force",
               "ext": "-F",
+              "fat": "-I",
               "ntfs": "--force",
               "reiserfs": "-f",
               "swap": "--force",

=== modified file 'examples/tests/basic.yaml'
--- examples/tests/basic.yaml	2016-04-04 16:03:32 +0000
+++ examples/tests/basic.yaml	2016-06-30 22:31:57 +0000
@@ -42,6 +42,10 @@
         path: /dev/vdc
         name: sparedisk
         wipe: superblock
+      - id: sparedisk_fat_fmt_id
+        type: format
+        fstype: fat32
+        volume: sparedisk_id
       - id: btrfs_disk_id
         type: disk
         path: /dev/vdd

=== modified file 'tests/unittests/test_block_mkfs.py'
--- tests/unittests/test_block_mkfs.py	2016-04-07 20:47:33 +0000
+++ tests/unittests/test_block_mkfs.py	2016-06-30 22:31:57 +0000
@@ -82,13 +82,13 @@
 
     def test_mkfs_fat(self):
         conf = self._get_config("fat32")
-        expected_flags = [["-n", "format1"], ["-F", "32"]]
+        expected_flags = ["-I", ["-n", "format1"], ["-F", "32"]]
         self._run_mkfs_with_config(conf, "mkfs.vfat", expected_flags)
 
     def test_mkfs_vfat(self):
         """Ensure we can use vfat without fatsize"""
         conf = self._get_config("vfat")
-        expected_flags = [["-n", "format1"], ]
+        expected_flags = ["-I", ["-n", "format1"], ]
         self._run_mkfs_with_config(conf, "mkfs.vfat", expected_flags)
 
     def test_mkfs_invalid_fstype(self):