diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst index 1e9e4d81..2c026211 100644 --- a/docs/CONTRIBUTING.rst +++ b/docs/CONTRIBUTING.rst @@ -185,8 +185,9 @@ Logging ------- If you're running module_build_service from scm, then the DevConfiguration -from ``conf/config.py`` which contains ``LOG_LEVEL=debug`` should get applied. See -more about it in ``module_build_service/config.py``, ``app.config.from_object()``. +from ``module_build_service/common/config.py`` which contains ``LOG_LEVEL=debug`` should get +applied. See more about it in ``module_build_service/common/config.py``, +``app.config.from_object()``. Environment ----------- diff --git a/module_build_service/__init__.py b/module_build_service/__init__.py index 2c7dbb29..c7af0379 100644 --- a/module_build_service/__init__.py +++ b/module_build_service/__init__.py @@ -34,7 +34,7 @@ from module_build_service.logger import init_logging, ModuleBuildLogs, level_fla from module_build_service.errors import ( ValidationError, Unauthorized, UnprocessableEntity, Conflict, NotFound, Forbidden, json_error) -from module_build_service.config import init_config +from module_build_service.common.config import init_config from module_build_service.proxy import ReverseProxy try: diff --git a/module_build_service/builder/KojiContentGenerator.py b/module_build_service/builder/KojiContentGenerator.py index b82d9d2e..56e4883b 100644 --- a/module_build_service/builder/KojiContentGenerator.py +++ b/module_build_service/builder/KojiContentGenerator.py @@ -55,7 +55,7 @@ class KojiContentGenerator(object): def __init__(self, module, config): """ :param module: module_build_service.models.ModuleBuild instance. - :param config: module_build_service.config.Config instance + :param config: module_build_service.common.config.Config instance """ self.owner = module.owner self.module = module diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index 974603ac..ecce661a 100644 --- a/module_build_service/builder/KojiModuleBuilder.py +++ b/module_build_service/builder/KojiModuleBuilder.py @@ -56,7 +56,7 @@ class KojiModuleBuilder(GenericBuilder): :param db_session: SQLAlchemy session object. :param owner: a string representing who kicked off the builds :param module: module_build_service.models.ModuleBuild instance. - :param config: module_build_service.config.Config instance + :param config: module_build_service.common.config.Config instance :param tag_name: name of tag for given module """ self.db_session = db_session @@ -757,7 +757,7 @@ class KojiModuleBuilder(GenericBuilder): @classmethod def repo_from_tag(cls, config, tag_name, arch): """ - :param config: instance of module_build_service.config.Config + :param config: instance of module_build_service.common.config.Config :param tag_name: Tag for which the repository is returned :param arch: Architecture for which the repository is returned diff --git a/module_build_service/builder/base.py b/module_build_service/builder/base.py index a4850076..b39c931b 100644 --- a/module_build_service/builder/base.py +++ b/module_build_service/builder/base.py @@ -65,7 +65,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)): External Api for builders Example usage: - config = module_build_service.config.Config() + config = module_build_service.common.config.Config() builder = Builder(module="testmodule-1.2-3", backend="koji", config) builder.buildroot_connect() builder.build(artifact_name="bash", @@ -110,7 +110,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)): :param owner: a string representing who kicked off the builds :param module: module_build_service.models.ModuleBuild instance. :param backend: a string representing backend e.g. 'koji' - :param config: instance of module_build_service.config.Config + :param config: instance of module_build_service.common.config.Config Any additional arguments are optional extras which can be passed along and are implementation-dependent. @@ -137,7 +137,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)): :param db_session: SQLAlchemy database session. :param module: module_build_service.models.ModuleBuild instance. - :param config: module_build_service.config.Config instance. + :param config: module_build_service.common.config.Config instance. :kwarg buildroot_connect: a boolean that determines if the builder should run buildroot_connect on instantiation. """ @@ -160,7 +160,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)): def tag_to_repo(cls, backend, config, tag_name, arch): """ :param backend: a string representing the backend e.g. 'koji'. - :param config: instance of module_build_service.config.Config + :param config: instance of module_build_service.common.config.Config :param tag_name: Tag for which the repository is returned :param arch: Architecture for which the repository is returned @@ -291,7 +291,7 @@ class GenericBuilder(six.with_metaclass(ABCMeta)): @abstractmethod def repo_from_tag(self, config, tag_name, arch): """ - :param config: instance of module_build_service.config.Config + :param config: instance of module_build_service.common.config.Config :param tag_name: Tag for which the repository is returned :param arch: Architecture for which the repository is returned diff --git a/module_build_service/config.py b/module_build_service/common/config.py similarity index 100% rename from module_build_service/config.py rename to module_build_service/common/config.py diff --git a/module_build_service/resolver/base.py b/module_build_service/resolver/base.py index 74e40326..e46744b1 100644 --- a/module_build_service/resolver/base.py +++ b/module_build_service/resolver/base.py @@ -6,7 +6,7 @@ import six from abc import ABCMeta, abstractmethod -import module_build_service.config as cfg +import module_build_service.common.config as cfg from module_build_service import conf diff --git a/module_build_service/scheduler/submit.py b/module_build_service/scheduler/submit.py index 6b18921c..1e3bebfa 100644 --- a/module_build_service/scheduler/submit.py +++ b/module_build_service/scheduler/submit.py @@ -20,7 +20,7 @@ def get_build_arches(mmd, config): Returns the list of architectures for which the module `mmd` should be built. :param mmd: Module MetaData - :param config: config (module_build_service.config.Config instance) + :param config: config (module_build_service.common.config.Config instance) :return list of architectures """ # Imported here to allow import of utils in GenericBuilder. diff --git a/tests/__init__.py b/tests/__init__.py index e1ca19d1..3181fec5 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -51,10 +51,10 @@ def read_staged_data(yaml_name): def patch_config(): # add test builders for all resolvers with_test_builders = dict() - for k, v in module_build_service.config.SUPPORTED_RESOLVERS.items(): + for k, v in module_build_service.common.config.SUPPORTED_RESOLVERS.items(): v["builders"].extend(["test", "testlocal"]) with_test_builders[k] = v - patch("module_build_service.config.SUPPORTED_RESOLVERS", with_test_builders) + patch("module_build_service.common.config.SUPPORTED_RESOLVERS", with_test_builders) patch_config() diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py index fb7a6d48..c7983241 100644 --- a/tests/test_build/test_build.py +++ b/tests/test_build/test_build.py @@ -397,7 +397,9 @@ class BaseTestBuild: @patch("module_build_service.scheduler.handlers.modules.handle_stream_collision_modules") @patch.object( - module_build_service.config.Config, "system", new_callable=PropertyMock, return_value="test" + module_build_service.common.config.Config, "system", + new_callable=PropertyMock, + return_value="test", ) @patch( "module_build_service.builder.GenericBuilder.default_buildroot_groups", @@ -459,7 +461,7 @@ class TestBuild(BaseTestBuild): self.mock_check_gating = self.p_check_gating.start() self.patch_config_broker = patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "celery_broker_url", create=True, new_callable=PropertyMock, @@ -668,7 +670,7 @@ class TestBuild(BaseTestBuild): assert module_build.state_reason == "Gating failed" @patch( - "module_build_service.config.Config.check_for_eol", + "module_build_service.common.config.Config.check_for_eol", new_callable=PropertyMock, return_value=True, ) @@ -710,7 +712,7 @@ class TestBuild(BaseTestBuild): yaml = read_staged_data("testmodule") with patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "yaml_submit_allowed", new_callable=PropertyMock, return_value=False, @@ -733,7 +735,7 @@ class TestBuild(BaseTestBuild): mocked_scm, "testmodule", "testmodule.yaml", "620ec77321b2ea7b0d67d82992dda3e1d67055b4") with patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "yaml_submit_allowed", new_callable=PropertyMock, return_value=True, @@ -855,7 +857,7 @@ class TestBuild(BaseTestBuild): @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.num_concurrent_builds", + "module_build_service.common.config.Config.num_concurrent_builds", new_callable=PropertyMock, return_value=1, ) @@ -914,7 +916,7 @@ class TestBuild(BaseTestBuild): @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.num_concurrent_builds", + "module_build_service.common.config.Config.num_concurrent_builds", new_callable=PropertyMock, return_value=2, ) @@ -979,7 +981,7 @@ class TestBuild(BaseTestBuild): @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.num_concurrent_builds", + "module_build_service.common.config.Config.num_concurrent_builds", new_callable=PropertyMock, return_value=1, ) @@ -1048,7 +1050,7 @@ class TestBuild(BaseTestBuild): @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.num_concurrent_builds", + "module_build_service.common.config.Config.num_concurrent_builds", new_callable=PropertyMock, return_value=1, ) @@ -1629,7 +1631,7 @@ class TestBuild(BaseTestBuild): @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.modules_allow_scratch", + "module_build_service.common.config.Config.modules_allow_scratch", new_callable=PropertyMock, return_value=True, ) @@ -1672,7 +1674,7 @@ class TestBuild(BaseTestBuild): @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.modules_allow_scratch", + "module_build_service.common.config.Config.modules_allow_scratch", new_callable=PropertyMock, return_value=True, ) @@ -1716,7 +1718,7 @@ class TestBuild(BaseTestBuild): @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.modules_allow_scratch", + "module_build_service.common.config.Config.modules_allow_scratch", new_callable=PropertyMock, return_value=True, ) @@ -1873,7 +1875,9 @@ class TestBuild(BaseTestBuild): @patch( - "module_build_service.config.Config.system", new_callable=PropertyMock, return_value="testlocal" + "module_build_service.common.config.Config.system", + new_callable=PropertyMock, + return_value="testlocal", ) class TestLocalBuild(BaseTestBuild): def setup_method(self, test_method): @@ -1896,7 +1900,7 @@ class TestLocalBuild(BaseTestBuild): @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.mock_resultsdir", + "module_build_service.common.config.Config.mock_resultsdir", new_callable=PropertyMock, return_value=staged_data_filename('local_builds'), ) diff --git a/tests/test_builder/test_builder_utils.py b/tests/test_builder/test_builder_utils.py index 22a613ae..a1141f26 100644 --- a/tests/test_builder/test_builder_utils.py +++ b/tests/test_builder/test_builder_utils.py @@ -244,7 +244,7 @@ def test_validate_koji_tag_is_None(): @patch( - "module_build_service.config.Config.allowed_privileged_module_names", + "module_build_service.common.config.Config.allowed_privileged_module_names", new_callable=PropertyMock, return_value=["testmodule"], ) @@ -300,7 +300,7 @@ def test_get_rpm_release_platform_stream_override(): @patch( - "module_build_service.config.Config.allowed_privileged_module_names", + "module_build_service.common.config.Config.allowed_privileged_module_names", new_callable=PropertyMock, return_value=["build"], ) diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py index f3763565..31d36d0c 100644 --- a/tests/test_builder/test_koji.py +++ b/tests/test_builder/test_koji.py @@ -874,12 +874,12 @@ class TestKojiBuilder: db_session.commit() with patch( - "module_build_service.config.Config.koji_enable_content_generator", + "module_build_service.common.config.Config.koji_enable_content_generator", new_callable=mock.PropertyMock, return_value=cg_enabled, ): with patch( - "module_build_service.config.Config.koji_cg_devel_module", + "module_build_service.common.config.Config.koji_cg_devel_module", new_callable=mock.PropertyMock, return_value=cg_devel_enabled, ): diff --git a/tests/test_builder/test_mock.py b/tests/test_builder/test_mock.py index 22e45eba..25b4a7a3 100644 --- a/tests/test_builder/test_mock.py +++ b/tests/test_builder/test_mock.py @@ -194,7 +194,7 @@ class TestMockModuleBuilderAddRepos: @mock.patch("module_build_service.conf.system", new="mock") @mock.patch( - "module_build_service.config.Config.base_module_repofiles", + "module_build_service.common.config.Config.base_module_repofiles", new_callable=mock.PropertyMock, return_value=["/etc/yum.repos.d/bar.repo", "/etc/yum.repos.d/bar-updates.repo"], create=True, @@ -308,12 +308,14 @@ class TestOfflineLocalBuilds: @mock.patch( - "module_build_service.config.Config.mock_resultsdir", + "module_build_service.common.config.Config.mock_resultsdir", new_callable=mock.PropertyMock, return_value=staged_data_filename("local_builds") ) @mock.patch( - "module_build_service.config.Config.system", new_callable=mock.PropertyMock, return_value="mock" + "module_build_service.common.config.Config.system", + new_callable=mock.PropertyMock, + return_value="mock", ) class TestLocalBuilds: def setup_method(self): diff --git a/tests/test_config.py b/tests/test_common/test_config.py similarity index 100% rename from tests/test_config.py rename to tests/test_common/test_config.py diff --git a/tests/test_common/test_resolve.py b/tests/test_common/test_resolve.py index efd62777..933b4470 100644 --- a/tests/test_common/test_resolve.py +++ b/tests/test_common/test_resolve.py @@ -74,7 +74,7 @@ class TestResolve: assert actual == expected @patch( - "module_build_service.config.Config.allow_only_compatible_base_modules", + "module_build_service.common.config.Config.allow_only_compatible_base_modules", new_callable=PropertyMock, return_value=False ) def test__get_base_module_mmds_virtual_streams_only_major_versions(self, cfg): diff --git a/tests/test_resolver/test_db.py b/tests/test_resolver/test_db.py index 832937d7..e8bce9ea 100644 --- a/tests/test_resolver/test_db.py +++ b/tests/test_resolver/test_db.py @@ -129,10 +129,12 @@ class TestDBModule: assert set(result) == {"module-f28-build"} @patch( - "module_build_service.config.Config.system", new_callable=PropertyMock, return_value="test" + "module_build_service.common.config.Config.system", + new_callable=PropertyMock, + return_value="test", ) @patch( - "module_build_service.config.Config.mock_resultsdir", + "module_build_service.common.config.Config.mock_resultsdir", new_callable=PropertyMock, return_value=tests.staged_data_filename("local_builds"), ) @@ -250,10 +252,12 @@ class TestDBModule: assert result == expected @patch( - "module_build_service.config.Config.system", new_callable=PropertyMock, return_value="test" + "module_build_service.common.config.Config.system", + new_callable=PropertyMock, + return_value="test", ) @patch( - "module_build_service.config.Config.mock_resultsdir", + "module_build_service.common.config.Config.mock_resultsdir", new_callable=PropertyMock, return_value=tests.staged_data_filename("local_builds") ) diff --git a/tests/test_resolver/test_mbs.py b/tests/test_resolver/test_mbs.py index c770a04a..d21b1955 100644 --- a/tests/test_resolver/test_mbs.py +++ b/tests/test_resolver/test_mbs.py @@ -317,10 +317,12 @@ class TestMBSModule: assert result == expected @patch( - "module_build_service.config.Config.system", new_callable=PropertyMock, return_value="test" + "module_build_service.common.config.Config.system", + new_callable=PropertyMock, + return_value="test", ) @patch( - "module_build_service.config.Config.mock_resultsdir", + "module_build_service.common.config.Config.mock_resultsdir", new_callable=PropertyMock, return_value=tests.staged_data_filename("local_builds") ) @@ -438,10 +440,12 @@ class TestMBSModule: ) @patch( - "module_build_service.config.Config.system", new_callable=PropertyMock, return_value="test" + "module_build_service.common.config.Config.system", + new_callable=PropertyMock, + return_value="test", ) @patch( - "module_build_service.config.Config.mock_resultsdir", + "module_build_service.common.config.Config.mock_resultsdir", new_callable=PropertyMock, return_value=tests.staged_data_filename("local_builds") ) diff --git a/tests/test_scheduler/test_batches.py b/tests/test_scheduler/test_batches.py index 29db790a..b6e6c51c 100644 --- a/tests/test_scheduler/test_batches.py +++ b/tests/test_scheduler/test_batches.py @@ -196,7 +196,7 @@ class TestBatches: @patch("module_build_service.scheduler.batches.start_build_component") @patch( - "module_build_service.config.Config.rebuild_strategy", + "module_build_service.common.config.Config.rebuild_strategy", new_callable=mock.PropertyMock, return_value="all", ) @@ -236,7 +236,7 @@ class TestBatches: @patch("module_build_service.scheduler.batches.start_build_component") @patch( - "module_build_service.config.Config.rebuild_strategy", + "module_build_service.common.config.Config.rebuild_strategy", new_callable=mock.PropertyMock, return_value="only-changed", ) diff --git a/tests/test_scheduler/test_greenwave_handler.py b/tests/test_scheduler/test_greenwave_handler.py index 2a1915b8..eaf93603 100644 --- a/tests/test_scheduler/test_greenwave_handler.py +++ b/tests/test_scheduler/test_greenwave_handler.py @@ -5,7 +5,7 @@ import pytest from mock import call, patch, PropertyMock, Mock from sqlalchemy import func -import module_build_service.config +import module_build_service.common.config from module_build_service import conf from module_build_service.db_session import db_session from module_build_service.models import BUILD_STATES, ModuleBuild @@ -75,7 +75,7 @@ class TestDecisionUpdateHandler: def setup_method(self, test_method): self.patch_config_broker = patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "celery_broker_url", create=True, new_callable=PropertyMock, diff --git a/tests/test_scheduler/test_module_init.py b/tests/test_scheduler/test_module_init.py index 5e262b08..d8a93ef5 100644 --- a/tests/test_scheduler/test_module_init.py +++ b/tests/test_scheduler/test_module_init.py @@ -118,7 +118,7 @@ class TestModuleInit: assert build.state == 4, build.state @patch( - "module_build_service.config.Config.modules_allow_repository", + "module_build_service.common.config.Config.modules_allow_repository", new_callable=PropertyMock, return_value=True, ) diff --git a/tests/test_scheduler/test_module_wait.py b/tests/test_scheduler/test_module_wait.py index 3aaa3b99..8711c605 100644 --- a/tests/test_scheduler/test_module_wait.py +++ b/tests/test_scheduler/test_module_wait.py @@ -194,7 +194,7 @@ class TestModuleWait: @patch("module_build_service.resolver.DBResolver") @patch("module_build_service.resolver.GenericResolver") @patch( - "module_build_service.config.Config.base_module_names", + "module_build_service.common.config.Config.base_module_names", new_callable=mock.PropertyMock, return_value=["base-runtime", "platform"], ) diff --git a/tests/test_scheduler/test_reuse.py b/tests/test_scheduler/test_reuse.py index 1d13ce67..e9fa3f0c 100644 --- a/tests/test_scheduler/test_reuse.py +++ b/tests/test_scheduler/test_reuse.py @@ -296,7 +296,7 @@ class TestUtilsModuleReuse: @pytest.mark.parametrize("allow_ocbm", (True, False)) @mock.patch( - "module_build_service.config.Config.allow_only_compatible_base_modules", + "module_build_service.common.config.Config.allow_only_compatible_base_modules", new_callable=mock.PropertyMock, ) def test_get_reusable_module_use_latest_build(self, cfg, allow_ocbm): @@ -365,12 +365,12 @@ class TestUtilsModuleReuse: @pytest.mark.parametrize("allow_ocbm", (True, False)) @mock.patch( - "module_build_service.config.Config.allow_only_compatible_base_modules", + "module_build_service.common.config.Config.allow_only_compatible_base_modules", new_callable=mock.PropertyMock, ) @mock.patch("koji.ClientSession") @mock.patch( - "module_build_service.config.Config.resolver", + "module_build_service.common.config.Config.resolver", new_callable=mock.PropertyMock, return_value="koji" ) def test_get_reusable_module_koji_resolver( diff --git a/tests/test_scheduler/test_submit.py b/tests/test_scheduler/test_submit.py index 7705005a..9a701c75 100644 --- a/tests/test_scheduler/test_submit.py +++ b/tests/test_scheduler/test_submit.py @@ -50,7 +50,7 @@ class TestSubmit: assert set(r) == set(conf.arches) @mock.patch( - "module_build_service.config.Config.allowed_privileged_module_names", + "module_build_service.common.config.Config.allowed_privileged_module_names", new_callable=mock.PropertyMock, return_value=["testmodule"], ) diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py index 777cd84e..dcdcf032 100644 --- a/tests/test_views/test_views.py +++ b/tests/test_views/test_views.py @@ -33,7 +33,7 @@ from module_build_service.db_session import db_session from module_build_service.errors import UnprocessableEntity from module_build_service.models import ModuleBuild, BUILD_STATES, ComponentBuild from module_build_service import app, version -import module_build_service.config as mbs_config +import module_build_service.common.config as mbs_config import module_build_service.web.submit @@ -496,7 +496,7 @@ class TestViews: mock_session.krb_login.assert_not_called() @patch( - "module_build_service.config.Config.system", + "module_build_service.common.config.Config.system", new_callable=PropertyMock, return_value="invalid_builder", ) @@ -1015,7 +1015,7 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.rebuild_strategy_allow_override", + "module_build_service.common.config.Config.rebuild_strategy_allow_override", new_callable=PropertyMock, return_value=True, ) @@ -1040,12 +1040,12 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.rebuild_strategies_allowed", + "module_build_service.common.config.Config.rebuild_strategies_allowed", new_callable=PropertyMock, return_value=["all"], ) @patch( - "module_build_service.config.Config.rebuild_strategy_allow_override", + "module_build_service.common.config.Config.rebuild_strategy_allow_override", new_callable=PropertyMock, return_value=True, ) @@ -1300,7 +1300,7 @@ class TestViews: ) def test_cancel_build_admin(self, mocked_get_user): with patch( - "module_build_service.config.Config.admin_groups", + "module_build_service.common.config.Config.admin_groups", new_callable=PropertyMock, return_value={"mbs-admin"}, ): @@ -1314,7 +1314,7 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=("sammy", {"packager"})) def test_cancel_build_no_admin(self, mocked_get_user): with patch( - "module_build_service.config.Config.admin_groups", + "module_build_service.common.config.Config.admin_groups", new_callable=PropertyMock, return_value={"mbs-admin"}, ): @@ -1431,7 +1431,9 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=anonymous_user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.no_auth", new_callable=PropertyMock, return_value=True + "module_build_service.common.config.Config.no_auth", + new_callable=PropertyMock, + return_value=True, ) def test_submit_build_no_auth_set_owner(self, mocked_conf, mocked_scm, mocked_get_user): FakeSCM( @@ -1451,7 +1453,7 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=("svc_account", set())) @patch("module_build_service.scm.SCM") - @patch("module_build_service.config.Config.allowed_users", new_callable=PropertyMock) + @patch("module_build_service.common.config.Config.allowed_users", new_callable=PropertyMock) def test_submit_build_allowed_users(self, allowed_users, mocked_scm, mocked_get_user): FakeSCM( mocked_scm, "testmodule", "testmodule.yaml", "620ec77321b2ea7b0d67d82992dda3e1d67055b4") @@ -1467,7 +1469,7 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=anonymous_user) @patch("module_build_service.scm.SCM") - @patch("module_build_service.config.Config.no_auth", new_callable=PropertyMock) + @patch("module_build_service.common.config.Config.no_auth", new_callable=PropertyMock) def test_patch_set_different_owner(self, mocked_no_auth, mocked_scm, mocked_get_user): FakeSCM( mocked_scm, "testmodule", "testmodule.yaml", "620ec77321b2ea7b0d67d82992dda3e1d67055b4") @@ -1521,7 +1523,10 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") - @patch("module_build_service.config.Config.allow_custom_scmurls", new_callable=PropertyMock) + @patch( + "module_build_service.common.config.Config.allow_custom_scmurls", + new_callable=PropertyMock, + ) def test_submit_custom_scmurl(self, allow_custom_scmurls, mocked_scm, mocked_get_user): FakeSCM( mocked_scm, "testmodule", "testmodule.yaml", "620ec77321b2ea7b0d67d82992dda3e1d67055b4") @@ -1846,7 +1851,7 @@ class TestViews: @pytest.mark.parametrize("api_version", [1, 2]) @patch("module_build_service.web.auth.get_user", return_value=user) @patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "allowed_groups_to_import_module", new_callable=PropertyMock, return_value=set(), @@ -1897,7 +1902,7 @@ class TestViews: @pytest.mark.parametrize("api_version", [1, 2]) @patch("module_build_service.web.auth.get_user", return_value=import_module_user) @patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "allow_custom_scmurls", new_callable=PropertyMock, return_value=True, @@ -1922,7 +1927,7 @@ class TestViews: @pytest.mark.parametrize("api_version", [1, 2]) @patch("module_build_service.web.auth.get_user", return_value=import_module_user) @patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "scmurls", new_callable=PropertyMock, return_value=["file://"], @@ -1961,7 +1966,7 @@ class TestViews: @pytest.mark.parametrize("api_version", [1, 2]) @patch("module_build_service.web.auth.get_user", return_value=import_module_user) @patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "scmurls", new_callable=PropertyMock, return_value=["file://"], @@ -2002,7 +2007,7 @@ class TestViews: @pytest.mark.parametrize("api_version", [1, 2]) @patch("module_build_service.web.auth.get_user", return_value=import_module_user) @patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "scmurls", new_callable=PropertyMock, return_value=["file://"], @@ -2025,7 +2030,7 @@ class TestViews: @pytest.mark.parametrize("api_version", [1, 2]) @patch("module_build_service.web.auth.get_user", return_value=import_module_user) @patch.object( - module_build_service.config.Config, + module_build_service.common.config.Config, "scmurls", new_callable=PropertyMock, return_value=["file://"], @@ -2073,7 +2078,7 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.modules_allow_scratch", + "module_build_service.common.config.Config.modules_allow_scratch", new_callable=PropertyMock, return_value=True, ) @@ -2135,7 +2140,7 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.modules_allow_scratch", + "module_build_service.common.config.Config.modules_allow_scratch", new_callable=PropertyMock, return_value=False, ) @@ -2165,12 +2170,12 @@ class TestViews: @pytest.mark.parametrize("api_version", [1, 2]) @patch("module_build_service.web.auth.get_user", return_value=user) @patch( - "module_build_service.config.Config.modules_allow_scratch", + "module_build_service.common.config.Config.modules_allow_scratch", new_callable=PropertyMock, return_value=True, ) @patch( - "module_build_service.config.Config.yaml_submit_allowed", + "module_build_service.common.config.Config.yaml_submit_allowed", new_callable=PropertyMock, return_value=True, ) @@ -2229,12 +2234,12 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch( - "module_build_service.config.Config.modules_allow_scratch", + "module_build_service.common.config.Config.modules_allow_scratch", new_callable=PropertyMock, return_value=True, ) @patch( - "module_build_service.config.Config.yaml_submit_allowed", + "module_build_service.common.config.Config.yaml_submit_allowed", new_callable=PropertyMock, return_value=True, ) @@ -2263,12 +2268,12 @@ class TestViews: @pytest.mark.parametrize("api_version", [1, 2]) @patch("module_build_service.web.auth.get_user", return_value=user) @patch( - "module_build_service.config.Config.modules_allow_scratch", + "module_build_service.common.config.Config.modules_allow_scratch", new_callable=PropertyMock, return_value=True, ) @patch( - "module_build_service.config.Config.yaml_submit_allowed", + "module_build_service.common.config.Config.yaml_submit_allowed", new_callable=PropertyMock, return_value=False, ) @@ -2301,7 +2306,9 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch.object( - module_build_service.config.Config, "br_stream_override_regexes", new_callable=PropertyMock + module_build_service.common.config.Config, + "br_stream_override_regexes", + new_callable=PropertyMock, ) def test_submit_build_dep_override_from_branch( self, mocked_regexes, mocked_scm, mocked_get_user, branch, platform_override @@ -2348,7 +2355,9 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch.object( - module_build_service.config.Config, "br_stream_override_regexes", new_callable=PropertyMock + module_build_service.common.config.Config, + "br_stream_override_regexes", + new_callable=PropertyMock, ) def test_submit_build_dep_override_from_branch_br_override( self, mocked_regexes, mocked_scm, mocked_get_user @@ -2422,7 +2431,7 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.allowed_privileged_module_names", + "module_build_service.common.config.Config.allowed_privileged_module_names", new_callable=PropertyMock, return_value=["build"], ) @@ -2597,11 +2606,11 @@ class TestViews: new_callable=partial(Mock, wraps=datetime), ) @patch( - "module_build_service.config.Config.product_pages_url", + "module_build_service.common.config.Config.product_pages_url", new_callable=PropertyMock, ) @patch( - "module_build_service.config.Config.product_pages_module_streams", + "module_build_service.common.config.Config.product_pages_module_streams", new_callable=PropertyMock, ) @patch("requests.get") @@ -2738,7 +2747,7 @@ class TestViews: @patch("module_build_service.web.auth.get_user", return_value=user) @patch("module_build_service.scm.SCM") @patch( - "module_build_service.config.Config.rebuild_strategy_allow_override", + "module_build_service.common.config.Config.rebuild_strategy_allow_override", new_callable=PropertyMock, return_value=True, ) diff --git a/tests/test_web/test_auth.py b/tests/test_web/test_auth.py index ff9f6157..397930b2 100644 --- a/tests/test_web/test_auth.py +++ b/tests/test_web/test_auth.py @@ -9,7 +9,7 @@ from mock import patch, PropertyMock, Mock import module_build_service.web.auth import module_build_service.errors -import module_build_service.config as mbs_config +import module_build_service.common.config as mbs_config from module_build_service import app diff --git a/tests/test_web/test_submit.py b/tests/test_web/test_submit.py index 105e1521..b52d5f9f 100644 --- a/tests/test_web/test_submit.py +++ b/tests/test_web/test_submit.py @@ -108,7 +108,7 @@ class TestUtilsComponentReuse: @mock.patch("module_build_service.web.submit.generate_expanded_mmds") @mock.patch( - "module_build_service.config.Config.scratch_build_only_branches", + "module_build_service.common.config.Config.scratch_build_only_branches", new_callable=mock.PropertyMock, return_value=["^private-.*"], )