robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config: Deprecate bootable option

Browse source 
JIRA: COMPOSE-2635
Fixes: https://pagure.io/pungi/issue/976
Signed-off-by: Haibo Lin <hlin@redhat.com>
This commit is contained in:
Haibo Lin 2019-07-22 15:29:47 +08:00
parent cf52665a8d
commit 3811c0a176
11 changed files with 14 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/data/dummy-pungi.conf
View file

@ -95,10 +95,6 @@ multilib_whitelist = {
}
# BUILDINSTALL
bootable = False
# CREATEISO
createiso_skip = [
('^Server-ResilientStorage$', {

2
tests/test_buildinstall.py
View file

@ -74,7 +74,7 @@ class TestBuildinstallPhase(PungiTestCase):
self.assertEqual(1, len(pool.queue_put.mock_calls))
def test_does_not_skip_on_bootable(self):
compose = BuildInstallCompose(self.topdir, {'bootable': True})
compose = BuildInstallCompose(self.topdir, {'buildinstall_method': 'lorax'})
compose.just_phases = None
compose.skip_phases = []

4
tests/test_checks.py
View file

@ -90,7 +90,7 @@ class CheckDependenciesTestCase(unittest.TestCase):
def test_isohybrid_not_required_on_arm(self):
conf = {
'bootable': True,
'buildinstall_method': 'lorax',
'productimg': True,
'runroot_tag': 'dummy_tag',
}
@ -135,7 +135,7 @@ class CheckDependenciesTestCase(unittest.TestCase):
conf = {
'runroot_tag': 'dummy_tag',
'productimg': True,
'bootable': True,
'buildinstall_method': 'lorax',
}
with mock.patch('sys.stdout', new_callable=StringIO) as out:

19
tests/test_config.py
View file

@ -167,7 +167,7 @@ class RunrootConfigTestCase(ConfigTestCase):
class BuildinstallConfigTestCase(ConfigTestCase):
def test_bootable_without_method(self):
def test_bootable_deprecated(self):
cfg = load_config(
PKGSET_REPOS,
bootable=True,
@ -175,18 +175,7 @@ class BuildinstallConfigTestCase(ConfigTestCase):
self.assertValidation(
cfg,
[checks.REQUIRES.format('bootable', 'True', 'buildinstall_method')])
def test_non_bootable_with_method(self):
cfg = load_config(
PKGSET_REPOS,
bootable=False,
buildinstall_method='lorax',
)
self.assertValidation(
cfg,
[checks.CONFLICTS.format('bootable', 'False', 'buildinstall_method')])
warnings=['WARNING: Config option bootable was removed and has no effect; remove it. Setting buildinstall_method option if you want a bootable installer.'])
def test_buildinstall_method_without_bootable(self):
cfg = load_config(
@ -196,12 +185,11 @@ class BuildinstallConfigTestCase(ConfigTestCase):
self.assertValidation(
cfg,
[checks.CONFLICTS.format('bootable', 'False', 'buildinstall_method')])
[])
def test_buildinstall_with_lorax_options(self):
cfg = load_config(
PKGSET_REPOS,
bootable=True,
buildinstall_method='buildinstall',
lorax_options=[('^Server$', {})]
)
@ -213,7 +201,6 @@ class BuildinstallConfigTestCase(ConfigTestCase):
def test_lorax_with_lorax_options(self):
cfg = load_config(
PKGSET_REPOS,
bootable=True,
buildinstall_method='lorax',
lorax_options=[]
)