modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-30 05:30:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move models.py to common/models.py and views.py to web/views.py

Browse Source
This commit is contained in:
mprahl
2020-01-03 21:16:17 -05:00
parent c3dcaa6571
commit 63baaf9213
71 changed files with 216 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_resolver/test_db.py
View File

@@ -7,10 +7,11 @@ from mock import patch, PropertyMock
import pytest
import module_build_service.resolver as mbs_resolver
from module_build_service import conf, models, Modulemd
from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
from module_build_service.models import ModuleBuild
from module_build_service import conf, Modulemd
from module_build_service.common import models
from module_build_service.common.errors import UnprocessableEntity
from module_build_service.common.models import ModuleBuild
from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
from module_build_service.scheduler.db_session import db_session
from module_build_service.builder.MockModuleBuilder import load_local_builds
import tests

2
tests/test_resolver/test_koji.py
View File

@@ -5,11 +5,11 @@ from mock import patch, MagicMock
from datetime import datetime
from module_build_service import conf
from module_build_service.common.models import ModuleBuild, BUILD_STATES
from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
import module_build_service.resolver as mbs_resolver
import tests
from module_build_service.scheduler.db_session import db_session
from module_build_service.models import ModuleBuild, BUILD_STATES
@pytest.mark.usefixtures("reuse_component_init_data")

2
tests/test_resolver/test_local.py
View File

@@ -7,7 +7,7 @@ from module_build_service import conf
from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
import module_build_service.resolver as mbs_resolver
from module_build_service.scheduler.db_session import db_session
from module_build_service.models import ModuleBuild
from module_build_service.common.models import ModuleBuild
import tests

10
tests/test_resolver/test_mbs.py
View File

@@ -7,7 +7,7 @@ from module_build_service.builder.MockModuleBuilder import load_local_builds
from module_build_service.common.utils import load_mmd, mmd_to_str
import module_build_service.resolver as mbs_resolver
from module_build_service.scheduler.db_session import db_session
import module_build_service.models
import module_build_service.common.models
import tests
@@ -344,7 +344,8 @@ class TestMBSModule:
request_session.get.return_value = Mock(ok=True)
request_session.get.return_value.json.return_value = {"items": [], "meta": {"next": None}}
platform = db_session.query(module_build_service.models.ModuleBuild).filter_by(id=1).one()
platform = db_session.query(
module_build_service.common.models.ModuleBuild).filter_by(id=1).one()
result = resolver.get_buildrequired_modulemds("nodejs", "10", platform.mmd())
assert [] == result
@@ -376,7 +377,8 @@ class TestMBSModule:
"meta": {"next": None},
}
platform = db_session.query(module_build_service.models.ModuleBuild).filter_by(id=1).one()
platform = db_session.query(
module_build_service.common.models.ModuleBuild).filter_by(id=1).one()
result = resolver.get_buildrequired_modulemds("nodejs", "10", platform.mmd())
assert 1 == len(result)
@@ -491,7 +493,7 @@ class TestMBSModule:
resolver = mbs_resolver.GenericResolver.create(db_session, conf, backend="mbs")
platform = db_session.query(
module_build_service.models.ModuleBuild).filter_by(id=1).one()
module_build_service.common.models.ModuleBuild).filter_by(id=1).one()
platform_mmd = platform.mmd()
platform_xmd = platform_mmd.get_xmd()
platform_xmd["mbs"]["koji_tag_with_modules"] = "module-f29-build"