kernel plugin: use default per arch targets. #1209

Merged
merged 3 commits into from Mar 22, 2017
Jump to file or symbol
Failed to load files and symbols.
+38 −2
Split
Viewing a subset of changes. View all

update tests

  • Loading branch information...
commit e1e0dbb56564bdc532479e1a8066ca89e866ff05 @sergiusens sergiusens committed Mar 22, 2017
@@ -76,7 +76,7 @@
default_kernel_image_target = {
'amd64': 'bzImage',
- 'i386': 'bzImge',
+ 'i386': 'bzImage',
'armhf': 'zImage',
'arm64': 'Image.gz',
}
@@ -93,6 +93,7 @@ def schema(cls):
{'type': 'string'},
{'type': 'object'},
],
+ 'default': '',
}
schema['properties']['kernel-with-firmware'] = {
@@ -20,7 +20,7 @@
from unittest import mock
import fixtures
-from testtools.matchers import HasLength
+from testtools.matchers import Equals, HasLength
import snapcraft
from snapcraft import (
@@ -103,6 +103,8 @@ def test_schema(self):
self.assertEqual(
properties['kernel-image-target']['oneOf'],
[{'type': 'string'}, {'type': 'object'}])
+ self.assertEqual(
+ properties['kernel-image-target']['default'], '')
self.assertEqual(
properties['kernel-with-firmware']['type'], 'boolean')
@@ -923,3 +925,36 @@ def test_pull(self, download_mock):
download_mock.assert_called_once_with(
'ubuntu-core', 'edge', plugin.os_snap,
self.project_options.deb_arch, '')
+
+
+class KernelPluginDefaulTargetsTestCase(tests.TestCase):
+
+ scenarios = [
+ ('amd64', {'deb_arch': 'amd64', 'expected': 'bzImage'}),
+ ('i386', {'deb_arch': 'i386', 'expected': 'bzImage'}),
+ ('arm64', {'deb_arch': 'arm64', 'expected': 'Image.gz'}),
+ ('armhf', {'deb_arch': 'armhf', 'expected': 'zImage'}),
+ ]
+
+ def setUp(self):
+ super().setUp()
+
+ class Options:
+ build_parameters = []
+ kconfigfile = None
+ kdefconfig = []
+ kconfigs = []
+ kernel_image_target = ''
+ kernel_with_firmware = True
+ kernel_initrd_modules = []
+ kernel_initrd_firmware = []
+ kernel_device_trees = []
+ kernel_initrd_compression = 'gz'
+
+ self.options = Options()
+
+ def test_default(self):
+ project = snapcraft.ProjectOptions(target_deb_arch=self.deb_arch)
+ plugin = kernel.KernelPlugin('test-part', self.options, project)
+
+ self.assertThat(plugin.kernel_image_target, Equals(self.expected))