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

Fix KojiContentGenerator from a bug in PR 771

Browse Source
This commit is contained in:
mprahl
2017-11-09 14:29:22 -05:00
parent d1e80b8ad7
commit b0eada3e33
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_build_service/builder/KojiContentGenerator.py
View File

@@ -326,7 +326,7 @@ class KojiContentGenerator(object):
log_path = os.path.join(prepdir, "build.log") log_path = os.path.join(prepdir, "build.log")
try: try:
source = build_logs.path(self.module.id) source = build_logs.path(self.module)
log.info("Moving logs from %r to %r" % (source, log_path)) log.info("Moving logs from %r to %r" % (source, log_path))
shutil.copy(source, log_path) shutil.copy(source, log_path)
except IOError as e: except IOError as e:

4
tests/test_content_generator.py
View File

@@ -61,7 +61,7 @@ class TestBuild(unittest.TestCase):
# Ensure that there is no build log from other tests # Ensure that there is no build log from other tests
try: try:
path = build_logs.path(self.cg.module.id) path = build_logs.path(self.cg.module)
os.remove(path) os.remove(path)
except OSError: except OSError:
pass pass
@@ -75,7 +75,7 @@ class TestBuild(unittest.TestCase):
import moksha.hub.reactor # noqa import moksha.hub.reactor # noqa
self.vcr.__exit__() self.vcr.__exit__()
try: try:
path = build_logs.path(self.cg.module.id) path = build_logs.path(self.cg.module)
os.remove(path) os.remove(path)
except OSError: except OSError:
pass pass

4
tests/test_scheduler/test_module_wait.py
View File

@@ -66,12 +66,14 @@ class TestModuleWait(unittest.TestCase):
builder.module_build_tag = {'name': 'some-tag-build'} builder.module_build_tag = {'name': 'some-tag-build'}
create_builder.return_value = builder create_builder.return_value = builder
mocked_module_build = mock.Mock() mocked_module_build = mock.Mock()
mocked_module_build.extended_json.return_value = { mocked_module_build.json.return_value = {
'name': 'foo', 'name': 'foo',
'stream': 1, 'stream': 1,
'version': 1, 'version': 1,
'state': 'some state', 'state': 'some state',
'id': 1
} }
mocked_module_build.extended_json = mocked_module_build.json
mmd = _modulemd.ModuleMetadata() mmd = _modulemd.ModuleMetadata()
formatted_testmodule_yml_path = os.path.join( formatted_testmodule_yml_path = os.path.join(