48817a6441
Command.run() currently has a bit of a confusing behavior: if raise_on_error is False and the executable is not found, then a weird CommandT is returned (return code is -1 and stdout+stderr is None). This makes it possible to hanlde command not found errors separately, but it makes that needlessly verbose. So instead, let's just return None in *this* special case. That in turn uncovered, that in most cases when we set `raise_on_error=True`, we actually want an error if the command is not present but no error if the command fails to execute (e.g. because it returns -1 if you run `$cmd --version`). Hence we introduce the flag `raise_on_command_not_found`, which causes an exception to be raised if the command is not found. This makes it independent of the `raise_on_error` flag. Additionally, we add a small optimization: if command starts with /, then we assume it's a full path and we omit the call to which (and just check whether it exists). Co-authored-by: Marcus Schäfer <marcus.schaefer@gmail.com>
192 lines
7.1 KiB
Python
192 lines
7.1 KiB
Python
# vim: set fileencoding=utf-8
|
|
from unittest.mock import patch
|
|
|
|
import os
|
|
|
|
from kiwi.system.profile import Profile
|
|
from kiwi.xml_state import XMLState
|
|
from kiwi.xml_description import XMLDescription
|
|
|
|
|
|
class TestProfile:
|
|
def setup(self):
|
|
self.profile_file = 'tmpfile.profile'
|
|
description = XMLDescription('../data/example_dot_profile_config.xml')
|
|
self.profile = Profile(
|
|
XMLState(description.load())
|
|
)
|
|
live_description = XMLDescription(
|
|
'../data/example_dot_profile_live_config.xml'
|
|
)
|
|
self.live_profile = Profile(
|
|
XMLState(live_description.load())
|
|
)
|
|
|
|
def setup_method(self, cls):
|
|
self.setup()
|
|
|
|
@patch('kiwi.path.Path.which')
|
|
def test_create_live(self, mock_which):
|
|
mock_which.side_effect = ['cp', 'bash']
|
|
self.live_profile.create(self.profile_file)
|
|
os.remove(self.profile_file)
|
|
assert self.live_profile.dot_profile == {
|
|
'kiwi_iname': 'LiveImage',
|
|
'kiwi_displayname': 'Live',
|
|
'kiwi_profiles': '',
|
|
'kiwi_delete': '',
|
|
'kiwi_type': 'iso',
|
|
'kiwi_compressed': None,
|
|
'kiwi_boot_timeout': None,
|
|
'kiwi_wwid_wait_timeout': None,
|
|
'kiwi_hybridpersistent': True,
|
|
'kiwi_hybridpersistent_filesystem': 'ext4',
|
|
'kiwi_initrd_system': 'dracut',
|
|
'kiwi_ramonly': None,
|
|
'kiwi_target_blocksize': None,
|
|
'kiwi_target_removable': None,
|
|
'kiwi_cmdline': 'console=ttyS0',
|
|
'kiwi_firmware': 'bios',
|
|
'kiwi_bootloader': 'grub2',
|
|
'kiwi_bootloader_console': 'default:default',
|
|
'kiwi_btrfs_root_is_snapshot': None,
|
|
'kiwi_gpt_hybrid_mbr': None,
|
|
'kiwi_devicepersistency': None,
|
|
'kiwi_installboot': None,
|
|
'kiwi_bootkernel': None,
|
|
'kiwi_fsmountoptions': None,
|
|
'kiwi_bootprofile': None,
|
|
'kiwi_vga': None,
|
|
'kiwi_startsector': 2048,
|
|
'kiwi_luks_empty_passphrase': False,
|
|
'kiwi_live_volid': 'CDROM',
|
|
'kiwi_iversion': '1.1.0',
|
|
'kiwi_showlicense': None,
|
|
'kiwi_keytable': 'us.map.gz',
|
|
'kiwi_timezone': 'Europe/Berlin',
|
|
'kiwi_language': 'en_US',
|
|
'kiwi_splash_theme': None,
|
|
'kiwi_loader_theme': None,
|
|
'kiwi_strip_delete': '',
|
|
'kiwi_strip_tools': '',
|
|
'kiwi_strip_libs': '',
|
|
'kiwi_drivers': '',
|
|
'kiwi_rootpartuuid': None
|
|
}
|
|
|
|
@patch('kiwi.path.Path.which')
|
|
def test_create_oem(self, mock_which):
|
|
mock_which.side_effect = ['cp', 'bash']
|
|
self.profile.create(self.profile_file)
|
|
os.remove(self.profile_file)
|
|
assert self.profile.dot_profile == {
|
|
'kiwi_Volume_1': 'usr_lib|size:1024|usr/lib',
|
|
'kiwi_Volume_2': 'etc_volume|freespace:30|etc',
|
|
'kiwi_Volume_3': 'bin_volume|size:all|/usr/bin',
|
|
'kiwi_Volume_4': 'usr_bin|freespace:30|usr/bin',
|
|
'kiwi_Volume_5': 'LVSwap|size:128|',
|
|
'kiwi_Volume_Root': 'LVRoot|freespace:500|',
|
|
'kiwi_bootkernel': None,
|
|
'kiwi_bootloader': 'grub2',
|
|
'kiwi_bootprofile': None,
|
|
'kiwi_target_removable': None,
|
|
'kiwi_boot_timeout': None,
|
|
'kiwi_cmdline': 'splash',
|
|
'kiwi_compressed': None,
|
|
'kiwi_delete': '',
|
|
'kiwi_devicepersistency': None,
|
|
'kiwi_bootloader_console': 'default:default',
|
|
'kiwi_displayname': 'schäfer',
|
|
'kiwi_drivers': '',
|
|
'kiwi_firmware': 'efi',
|
|
'kiwi_fsmountoptions': None,
|
|
'kiwi_hybridpersistent_filesystem': None,
|
|
'kiwi_hybridpersistent': None,
|
|
'kiwi_iname': 'LimeJeOS-openSUSE-13.2',
|
|
'kiwi_installboot': None,
|
|
'kiwi_iversion': '1.13.2',
|
|
'kiwi_keytable': 'us.map.gz',
|
|
'kiwi_language': 'en_US',
|
|
'kiwi_loader_theme': 'openSUSE',
|
|
'kiwi_lvm': 'true',
|
|
'kiwi_lvmgroup': 'systemVG',
|
|
'kiwi_oembootwait': None,
|
|
'kiwi_oemdevicefilter': None,
|
|
'kiwi_oemnicfilter': None,
|
|
'kiwi_oemkboot': None,
|
|
'kiwi_oemmultipath_scan': None,
|
|
'kiwi_oempartition_install': None,
|
|
'kiwi_oemrebootinteractive': None,
|
|
'kiwi_oemreboot': None,
|
|
'kiwi_oemrecoveryID': None,
|
|
'kiwi_oemrecoveryInPlace': None,
|
|
'kiwi_oemrecovery': False,
|
|
'kiwi_oemrecoveryPartSize': None,
|
|
'kiwi_oemrootMB': 2048,
|
|
'kiwi_oemshutdowninteractive': None,
|
|
'kiwi_oemresizeonce': None,
|
|
'kiwi_oemshutdown': None,
|
|
'kiwi_oemsilentboot': None,
|
|
'kiwi_oemsilentinstall': None,
|
|
'kiwi_oemsilentverify': None,
|
|
'kiwi_oemskipverify': 'true',
|
|
'kiwi_oemswapMB': None,
|
|
'kiwi_oemtitle': 'schäfer',
|
|
'kiwi_oemunattended_id': None,
|
|
'kiwi_oemunattended': None,
|
|
'kiwi_oemvmcp_parmfile': None,
|
|
'kiwi_profiles': '',
|
|
'kiwi_ramonly': True,
|
|
'kiwi_initrd_system': 'dracut',
|
|
'kiwi_install_volid': 'INSTALL',
|
|
'kiwi_btrfs_root_is_snapshot': None,
|
|
'kiwi_gpt_hybrid_mbr': None,
|
|
'kiwi_showlicense': None,
|
|
'kiwi_splash_theme': 'openSUSE',
|
|
'kiwi_strip_delete': '',
|
|
'kiwi_strip_libs': '',
|
|
'kiwi_strip_tools': '',
|
|
'kiwi_target_blocksize': None,
|
|
'kiwi_timezone': 'Europe/Berlin',
|
|
'kiwi_type': 'oem',
|
|
'kiwi_vga': None,
|
|
'kiwi_startsector': 2048,
|
|
'kiwi_luks_empty_passphrase': True,
|
|
'kiwi_wwid_wait_timeout': None,
|
|
'kiwi_xendomain': 'dom0',
|
|
'kiwi_rootpartuuid': None
|
|
}
|
|
|
|
@patch('kiwi.path.Path.which')
|
|
def test_create_displayname_is_image_name(self, mock_which):
|
|
mock_which.side_effect = ['cp', 'bash']
|
|
description = XMLDescription('../data/example_pxe_config.xml')
|
|
profile = Profile(
|
|
XMLState(description.load())
|
|
)
|
|
profile.create(self.profile_file)
|
|
os.remove(self.profile_file)
|
|
assert profile.dot_profile['kiwi_displayname'] == \
|
|
'LimeJeOS-openSUSE-13.2'
|
|
|
|
@patch('kiwi.path.Path.which')
|
|
def test_create_cpio(self, mock_which):
|
|
mock_which.side_effect = ['cp', 'bash']
|
|
description = XMLDescription('../data/example_dot_profile_config.xml')
|
|
profile = Profile(
|
|
XMLState(description.load(), None, 'cpio')
|
|
)
|
|
profile.create(self.profile_file)
|
|
os.remove(self.profile_file)
|
|
assert profile.dot_profile['kiwi_cpio_name'] == \
|
|
'LimeJeOS-openSUSE-13.2'
|
|
|
|
def test_add(self):
|
|
self.profile.add('foo', 'bar')
|
|
assert self.profile.dot_profile['foo'] == 'bar'
|
|
|
|
def test_delete(self):
|
|
self.profile.add('foo', 'bar')
|
|
self.profile.delete('foo')
|
|
assert 'foo' not in self.profile.dot_profile
|