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

Fix randomly failing test_build tests caused by different ordering of built components.

Browse Source
This commit is contained in:
Jan Kaluza
2017-03-31 10:47:19 +02:00
parent 0b12e85e97
commit 7fb73da3b7
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/test_build/test_build.py
View File

@@ -175,14 +175,14 @@ class TestModuleBuilder(GenericBuilder):
TestModuleBuilder._build_id += 1
if TestModuleBuilder.on_build_cb:
TestModuleBuilder.on_build_cb(self, artifact_name, source)
if TestModuleBuilder.BUILD_STATE != "BUILDING":
self._send_build_change(
koji.BUILD_STATES[TestModuleBuilder.BUILD_STATE], source,
TestModuleBuilder._build_id)
if TestModuleBuilder.on_build_cb:
TestModuleBuilder.on_build_cb(self, artifact_name, source)
if TestModuleBuilder.INSTANT_COMPLETE:
state = koji.BUILD_STATES['COMPLETE']
else:
@@ -265,11 +265,11 @@ class TestBuild(unittest.TestCase):
# Check that components are tagged after the batch is built.
tag_groups = []
tag_groups.append([u'perl-Tangerine?#f25-1-1', u'perl-List-Compare?#f25-1-1'])
tag_groups.append([u'tangerine?#f25-1-1'])
tag_groups.append(set([u'perl-Tangerine?#f25-1-1', u'perl-List-Compare?#f25-1-1']))
tag_groups.append(set([u'tangerine?#f25-1-1']))
def on_tag_artifacts_cb(cls, artifacts):
self.assertEqual(tag_groups.pop(0), artifacts)
self.assertEqual(tag_groups.pop(0), set(artifacts))
TestModuleBuilder.on_tag_artifacts_cb = on_tag_artifacts_cb
@@ -549,13 +549,11 @@ class TestBuild(unittest.TestCase):
module_build_id = data['id']
def on_build_cb(cls, artifact_name, source):
# Next component *after* the module-build-macros will fail
# to build.
if artifact_name.startswith("module-build-macros"):
# fail perl-Tangerine build
if artifact_name.startswith("perl-Tangerine"):
TestModuleBuilder.BUILD_STATE = "FAILED"
else:
TestModuleBuilder.BUILD_STATE = "COMPLETE"
print artifact_name
TestModuleBuilder.on_build_cb = on_build_cb
@@ -607,7 +605,7 @@ class TestBuild(unittest.TestCase):
def on_build_cb(cls, artifact_name, source):
# Next components *after* the module-build-macros will fail
# to build.
if artifact_name.startswith("module-build-macros"):
if not artifact_name.startswith("module-build-macros"):
TestModuleBuilder.BUILD_STATE = "FAILED"
TestModuleBuilder.on_build_cb = on_build_cb