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

Merge #1160 Fix the way how KojiContentGenerator computes filesize.

Browse Source
This commit is contained in:
Jan Kaluža
2019-03-07 15:44:43 +00:00
parent 293e74c3a5 04082047fe
commit b38feb5deb
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module_build_service/builder/KojiContentGenerator.py
View File

@@ -407,11 +407,12 @@ class KojiContentGenerator(object):
mmd_path = os.path.join(output_path, mmd_filename)
try:
with open(mmd_path, 'rb') as mmd_f:
data = to_text_type(mmd_f.read())
raw_data = mmd_f.read()
data = to_text_type(raw_data)
mmd = Modulemd.Module().new_from_string(data)
ret['filename'] = mmd_filename
ret['filesize'] = len(data)
ret['checksum'] = hashlib.md5(data.encode('utf-8')).hexdigest()
ret['filesize'] = len(raw_data)
ret['checksum'] = hashlib.md5(raw_data).hexdigest()
except IOError:
if arch == "src":
# This might happen in case the Module is submitted directly

8
tests/test_content_generator.py
View File

@@ -276,7 +276,7 @@ class TestBuild:
@patch("module_build_service.builder.KojiContentGenerator.open", create=True)
def test_get_arch_mmd_output(self, patched_open):
patched_open.return_value = mock_open(
read_data=self.cg.mmd).return_value
read_data=self.cg.mmd.encode("utf-8")).return_value
ret = self.cg._get_arch_mmd_output("./fake-dir", "x86_64")
assert ret == {
'arch': 'x86_64',
@@ -286,7 +286,7 @@ class TestBuild:
'components': [],
'extra': {'typeinfo': {'module': {}}},
'filename': 'modulemd.x86_64.txt',
'filesize': 1136,
'filesize': 1138,
'type': 'file'
}
@@ -296,7 +296,7 @@ class TestBuild:
rpm_artifacts = mmd.get_rpm_artifacts()
rpm_artifacts.add("dhcp-libs-12:4.3.5-5.module_2118aef6.x86_64")
mmd.set_rpm_artifacts(rpm_artifacts)
mmd_data = to_text_type(mmd.dumps())
mmd_data = bytes(mmd.dumps())
patched_open.return_value = mock_open(
read_data=mmd_data).return_value
@@ -336,7 +336,7 @@ class TestBuild:
u'version': '4.3.5'}],
'extra': {'typeinfo': {'module': {}}},
'filename': 'modulemd.x86_64.txt',
'filesize': 317,
'filesize': 319,
'type': 'file'
}

2
tests/test_get_generator_json_expected_output.json
View File

@@ -625,7 +625,7 @@
}
],
"arch": "noarch",
"filesize": 1136,
"filesize": 1138,
"checksum": "96b7739ffa3918e6ac3e3bd422b064ea",
"checksum_type": "md5",
"type": "file",

2
tests/test_get_generator_json_expected_output_with_log.json
View File

@@ -625,7 +625,7 @@
}
],
"arch": "noarch",
"filesize": 1136,
"filesize": 1138,
"checksum": "96b7739ffa3918e6ac3e3bd422b064ea",
"checksum_type": "md5",
"type": "file",