almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity
a03a46a078
pungi/tests/test_config.py

411 lines
13 KiB
Python
Raw Normal View History

Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
#!/usr/bin/env python
# -*- coding: utf-8 -*-
tests: Use unittest2 consistently Without importing this module, the tests are going to fail on Python 2.6. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-09-22 08:28:01 +00:00
try:
import unittest2 as unittest
except ImportError:
import unittest
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
import os
Port to Python 3 This should make all tests pass on both Python 2 and Python 3. Unittest2 is required on Py 2.6 and Py 3. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-09-05 08:01:21 +00:00
import six
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
import sys
Reject yum gather backend on Python 3 It will not run, and having a nice error message is better than a cryptic crash. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-09-21 07:41:43 +00:00
import mock
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
from pungi import checks
from tests.helpers import load_config, PKGSET_REPOS
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class ConfigTestCase(unittest.TestCase):
def assertValidation(self, cfg, errors=[], warnings=[]):
actual_errors, actual_warnings = checks.validate(cfg)
self.assertItemsEqual(errors, actual_errors)
self.assertEqual(warnings, actual_warnings)
class PkgsetConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate_minimal_pkgset_koji(self):
cfg = load_config(
pkgset_source='koji',
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate_minimal_pkgset_repos(self):
cfg = load_config(
pkgset_source='repos',
pkgset_repos={'x86_64': '/first', 'ppc64': '/second'},
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_pkgset_mismatch_repos(self):
cfg = load_config(
pkgset_source='repos',
pkgset_koji_tag='f25',
pkgset_koji_inherit=False,
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
[checks.REQUIRES.format('pkgset_source', 'repos', 'pkgset_repos'),
checks.CONFLICTS.format('pkgset_source', 'repos', 'pkgset_koji_tag'),
checks.CONFLICTS.format('pkgset_source', 'repos', 'pkgset_koji_inherit')])
def test_pkgset_mismatch_koji(self):
cfg = load_config(
pkgset_source='koji',
pkgset_repos={'whatever': '/foo'},
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
config: Make pkgset_koji_tag optional There are valid use cases for not specifying this option: specifically a modular compose will get the tags to use from modules listed in the variants file. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-11-07 13:05:50 +00:00
[checks.CONFLICTS.format('pkgset_source', 'koji', 'pkgset_repos')])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
pkgset: Allow populating packages from multiple koji tags One of the use cases is https://pagure.io/odcs/issue/7. Merges: #660 Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-06-27 11:48:02 +00:00
def test_pkgset_multiple_koji_tags(self):
cfg = load_config(
pkgset_source='koji',
pkgset_koji_tag=['f25', 'f25-extra'],
pkgset_koji_inherit=False,
)
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class ReleaseConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_layered_without_base_product(self):
cfg = load_config(
PKGSET_REPOS,
release_is_layered=True
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
[checks.REQUIRES.format('release_is_layered', 'True', 'base_product_name'),
checks.REQUIRES.format('release_is_layered', 'True', 'base_product_short'),
checks.REQUIRES.format('release_is_layered', 'True', 'base_product_version')])
def test_not_layered_with_base_product(self):
cfg = load_config(
PKGSET_REPOS,
base_product_name='Prod',
base_product_short='bp',
base_product_version='1.0',
base_product_type='updates',
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
[checks.CONFLICTS.format('release_is_layered', 'False', 'base_product_name'),
checks.CONFLICTS.format('release_is_layered', 'False', 'base_product_short'),
checks.CONFLICTS.format('release_is_layered', 'False', 'base_product_type'),
checks.CONFLICTS.format('release_is_layered', 'False', 'base_product_version')])
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class RunrootConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_runroot_without_deps(self):
cfg = load_config(
PKGSET_REPOS,
runroot=True,
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
[checks.REQUIRES.format('runroot', 'True', 'koji_profile'),
checks.REQUIRES.format('runroot', 'True', 'runroot_tag'),
checks.REQUIRES.format('runroot', 'True', 'runroot_channel')])
def test_koji_settings_without_runroot(self):
cfg = load_config(
PKGSET_REPOS,
runroot=False,
koji_profile='koji',
runroot_tag='f25',
runroot_channel='compose',
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
[checks.CONFLICTS.format('runroot', 'False', 'runroot_tag'),
checks.CONFLICTS.format('runroot', 'False', 'runroot_channel')])
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class BuildinstallConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_bootable_without_method(self):
cfg = load_config(
PKGSET_REPOS,
bootable=True,
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
[checks.REQUIRES.format('bootable', 'True', 'buildinstall_method')])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_non_bootable_with_method(self):
cfg = load_config(
PKGSET_REPOS,
bootable=False,
buildinstall_method='lorax',
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
[checks.CONFLICTS.format('bootable', 'False', 'buildinstall_method')])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_buildinstall_method_without_bootable(self):
cfg = load_config(
PKGSET_REPOS,
buildinstall_method='lorax',
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
[checks.CONFLICTS.format('bootable', 'False', 'buildinstall_method')])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_buildinstall_with_lorax_options(self):
cfg = load_config(
PKGSET_REPOS,
bootable=True,
buildinstall_method='buildinstall',
lorax_options=[('^Server$', {})]
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
[checks.CONFLICTS.format('buildinstall_method', 'buildinstall', 'lorax_options')])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_lorax_with_lorax_options(self):
cfg = load_config(
PKGSET_REPOS,
bootable=True,
buildinstall_method='lorax',
lorax_options=[]
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_lorax_options_without_bootable_and_method(self):
cfg = load_config(
PKGSET_REPOS,
lorax_options=[('^Server$', {})],
buildinstall_kickstart='foo',
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
[checks.CONFLICTS.format('buildinstall_method', 'None', 'lorax_options'),
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
checks.CONFLICTS.format('buildinstall_method', 'None', 'buildinstall_kickstart')])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class CreaterepoConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate_minimal_pkgset_koji(self):
cfg = load_config(
pkgset_source='koji',
pkgset_koji_tag="f25",
product_id_allow_missing=True,
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(
cfg,
[checks.CONFLICTS.format('product_id', 'None', 'product_id_allow_missing')])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class GatherConfigTestCase(ConfigTestCase):
Reject yum gather backend on Python 3 It will not run, and having a nice error message is better than a cryptic crash. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-09-21 07:41:43 +00:00
def test_dnf_backend_is_default_on_py3(self):
cfg = load_config(
pkgset_source='koji',
pkgset_koji_tag='f27',
)
with mock.patch('six.PY2', new=False):
self.assertValidation(cfg, [])
self.assertEqual(cfg['gather_backend'], 'dnf')
def test_yum_backend_is_default_on_py2(self):
cfg = load_config(
pkgset_source='koji',
pkgset_koji_tag='f27',
)
with mock.patch('six.PY2', new=True):
self.assertValidation(cfg, [])
self.assertEqual(cfg['gather_backend'], 'yum')
def test_yum_backend_is_rejected_on_py3(self):
cfg = load_config(
pkgset_source='koji',
pkgset_koji_tag='f27',
gather_backend='yum',
)
with mock.patch('six.PY2', new=False):
self.assertValidation(
cfg,
["Failed validation in gather_backend: 'yum' is not one of ['dnf']"])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class OSBSConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate(self):
cfg = load_config(
PKGSET_REPOS,
osbs={"^Server$": {
'url': 'http://example.com',
'target': 'f25-build',
osbs: Make git_branch required option In order to avoid conflicting tags, OSBS allows only one build for a repo/branch pair at the same time. To avoid race conditions, we should make sure we always pass in the branch. This commit makes it a required option. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-04-24 07:55:24 +00:00
'git_branch': 'f25',
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
}}
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate_bad_conf(self):
cfg = load_config(
PKGSET_REPOS,
osbs='yes please'
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertNotEqual(checks.validate(cfg), ([], []))
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class OstreeConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate(self):
cfg = load_config(
PKGSET_REPOS,
ostree=[
("^Atomic$", {
"x86_64": {
"treefile": "fedora-atomic-docker-host.json",
"config_url": "https://git.fedorahosted.org/git/fedora-atomic.git",
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
"repo": "Everything",
ostree: Autogenerate a version If the value is a particular magic string, we will expand it to a proper value. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-03-29 13:49:21 +00:00
"ostree_repo": "/mnt/koji/compose/atomic/Rawhide/",
"version": '!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN',
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
}
})
]
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate_bad_conf(self):
cfg = load_config(
PKGSET_REPOS,
ostree='yes please'
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertNotEqual(checks.validate(cfg), ([], []))
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class OstreeInstallerConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate(self):
cfg = load_config(
PKGSET_REPOS,
ostree_installer=[
("^Atomic$", {
"x86_64": {
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
"repo": "Everything",
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
"release": None,
"installpkgs": ["fedora-productimg-atomic"],
"add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
"add_template_var": [
"ostree_osname=fedora-atomic",
"ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
],
"add_arch_template": ["/spin-kickstarts/atomic-installer/lorax-embed-repo.tmpl"],
Expose lorax's --rootfs-size argument This is going to be necessary for reworking the Atomic Host ISO, see: https://pagure.io/fedora-lorax-templates/pull-request/6 Signed-off-by: Colin Walters <walters@verbum.org>
2016-11-17 15:15:03 +00:00
"rootfs_size": "3",
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
"add_arch_template_var": [
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/Rawhide/",
"ostree_osname=fedora-atomic",
"ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
]
}
})
]
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_validate_bad_conf(self):
cfg = load_config(
PKGSET_REPOS,
ostree_installer=[
("^Atomic$", {
"x86_64": {
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
"repo": "Everything",
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
"release": None,
"installpkgs": ["fedora-productimg-atomic"],
"add_template": ["/spin-kickstarts/atomic-installer/lorax-configure-repo.tmpl"],
"add_template_var": [
"ostree_osname=fedora-atomic",
"ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
],
"add_arch_template": 15,
"add_arch_template_var": [
"ostree_repo=https://kojipkgs.fedoraproject.org/compose/atomic/Rawhide/",
"ostree_osname=fedora-atomic",
"ostree_ref=fedora-atomic/Rawhide/x86_64/docker-host",
]
}
})
]
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertNotEqual(checks.validate(cfg), ([], []))
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class LiveMediaConfigTestCase(ConfigTestCase):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_global_config_validation(self):
cfg = load_config(
PKGSET_REPOS,
live_media_ksurl='git://example.com/repo.git#HEAD',
live_media_target='f24',
live_media_release='RRR',
live_media_version='Rawhide',
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
def test_global_config_null_release(self):
cfg = load_config(
PKGSET_REPOS,
live_media_release=None,
)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg)
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class TestSuggestions(ConfigTestCase):
init: Remove keep_original_comps option The same information can be inferred from definitions in variants.xml: if the variant has no groups defined, we include packages from all groups. By the same logic we can also include all groups in the comps file. The config validation is updated to give a hint on how to remove the option from the configuration. Relates: #29 Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-19 08:09:40 +00:00
def test_with_a_typo(self):
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
cfg = load_config(PKGSET_REPOS,
product_pid=None)
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
self.assertValidation(cfg, [], [checks.UNKNOWN_SUGGEST.format('product_pid', 'product_id')])
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
config: Report unknown options as warnings Given the way config files can include other files, it is entirely possible to use the same config file for both Pungi and Distill. Pungi will however complain about unknown options. This patch reverts part of c38bb480 and moves deprecation handling back into schema validation. The validation method then returns a list of errors and a list of warnings. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-12-07 14:57:35 +00:00
class TestRegexValidation(ConfigTestCase):
config: Validate variant regular expressions When the mapping in configuration specifies incorrect regular expression to match regular expressions, we should raise an error immediately and not wait until the part of config is actually used. This patch does not cover `live_media`, `image_build` and `osbs` sections, as they use plain dicts and not the list of tuples format. Fixes: #424 Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-10-12 07:38:59 +00:00
def test_incorrect_regular_expression(self):
cfg = load_config(PKGSET_REPOS,
multilib=[('^*$', {'*': []})])
Port to Python 3 This should make all tests pass on both Python 2 and Python 3. Unittest2 is required on Py 2.6 and Py 3. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-09-05 08:01:21 +00:00
msg = 'Failed validation in multilib.0.0: incorrect regular expression: nothing to repeat'
if six.PY3:
msg += ' at position 1'
self.assertValidation(cfg, [msg], [])
config: Validate variant regular expressions When the mapping in configuration specifies incorrect regular expression to match regular expressions, we should raise an error immediately and not wait until the part of config is actually used. This patch does not cover `live_media`, `image_build` and `osbs` sections, as they use plain dicts and not the list of tuples format. Fixes: #424 Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-10-12 07:38:59 +00:00
repoclosure: add option to use dnf backend This adds a new option repoclosure_backend that changes what tool is used for repoclosure. Checking build dependencies is currently not supported, as `dnf` does not have the corresponding option. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-01-26 08:19:12 +00:00
class RepoclosureTestCase(ConfigTestCase):
def test_invalid_backend(self):
cfg = load_config(
PKGSET_REPOS,
repoclosure_backend='fnd', # Intentionally with a typo
)
Use dnf backend for repoclosure on PY3 When yum is not available, it makes no sense to offer it as an option. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-12-04 11:30:18 +00:00
options = ['yum', 'dnf'] if six.PY2 else ['dnf']
repoclosure: add option to use dnf backend This adds a new option repoclosure_backend that changes what tool is used for repoclosure. Checking build dependencies is currently not supported, as `dnf` does not have the corresponding option. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-01-26 08:19:12 +00:00
self.assertValidation(
cfg,
Use dnf backend for repoclosure on PY3 When yum is not available, it makes no sense to offer it as an option. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-12-04 11:30:18 +00:00
["Failed validation in repoclosure_backend: 'fnd' is not one of %s" % options])
repoclosure: add option to use dnf backend This adds a new option repoclosure_backend that changes what tool is used for repoclosure. Checking build dependencies is currently not supported, as `dnf` does not have the corresponding option. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-01-26 08:19:12 +00:00
Add JSON Schema for configuration The schema is written in Python to reduce duplication. When configuration is loaded, the validation checks if it's correct and fills in default values. There is a custom extension to the schema to report deprecated options. The config dependencies are implemented as a separate pass. While it's technically possible to express the dependencies in the schema itself, the error messages are not very helpful and it makes the schema much harder to read. Phases no longer define `config_options`. New options should be added to the schema. Since the default values are populated automatically during validation, there is no need to duplicate them into the code. The `pungi-config-validate` script is updated to use the schema and report errors even for deeply nested fields. The dependencies are updated: pungi now depends on `python-jsonschema` (which is already available in Fedora). Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-08-22 14:08:25 +00:00
if __name__ == '__main__':
unittest.main()
Reference in New Issue Copy Permalink