Prefix the module version based on the platform it buildrequires

This commit is contained in:
mprahl
2018-10-02 09:39:37 -04:00
parent 54c1ed7166
commit cfb75b4d0f
4 changed files with 95 additions and 10 deletions

View File

@@ -869,7 +869,7 @@ class TestBuild:
build_one = models.ModuleBuild()
build_one.name = 'testmodule'
build_one.stream = 'master'
build_one.version = 20180205135154
build_one.version = '2820180205135154'
build_one.build_context = 'return_runtime_context'
build_one.ref_build_context = 'return_runtime_context'
build_one.runtime_context = '9c690d0e'
@@ -994,7 +994,7 @@ class TestBuild:
build_one = models.ModuleBuild()
build_one.name = 'testmodule'
build_one.stream = 'master'
build_one.version = 20180205135154
build_one.version = '2820180205135154'
build_one.build_context = 'return_runtime_context'
build_one.ref_build_context = 'return_runtime_context'
build_one.runtime_context = '9c690d0e'

View File

@@ -29,7 +29,8 @@ import module_build_service.scm
from module_build_service import models, conf
from module_build_service.errors import ProgrammingError, ValidationError, UnprocessableEntity
from tests import (
reuse_component_init_data, db, reuse_shared_userspace_init_data, clean_database, init_data)
reuse_component_init_data, db, reuse_shared_userspace_init_data, clean_database, init_data,
scheduler_init_data)
import mock
import koji
import pytest
@@ -579,6 +580,22 @@ class TestUtils:
is_eol = module_build_service.utils.submit._is_eol_in_pdc('mariadb', '10.1')
assert is_eol
def test_get_prefixed_version_f28(self):
scheduler_init_data(1)
build_one = models.ModuleBuild.query.get(2)
v = module_build_service.utils.submit.get_prefixed_version(build_one.mmd())
assert v == 2820180205135154
def test_get_prefixed_version_fl701(self):
scheduler_init_data(1)
build_one = models.ModuleBuild.query.get(2)
mmd = build_one.mmd()
xmd = glib.from_variant_dict(mmd.get_xmd())
xmd['mbs']['buildrequires']['platform']['stream'] = 'fl7.0.1-beta'
mmd.set_xmd(glib.dict_values(xmd))
v = module_build_service.utils.submit.get_prefixed_version(mmd)
assert v == 7000120180205135154
class DummyModuleBuilder(GenericBuilder):
"""

View File

@@ -685,7 +685,7 @@ class TestViews:
assert data['name'] == 'testmodule'
assert data['scmurl'] == ('git://pkgs.stg.fedoraproject.org/modules/testmodule.git'
'?#68931c90de214d9d13feefbd35246a81b6cb8d49')
assert data['version'] == '1'
assert data['version'] == '281'
assert data['time_submitted'] is not None
assert data['time_modified'] is not None
assert data['time_completed'] is None