From ea650047a16fa2ad722c982023a09c9da87eaab3 Mon Sep 17 00:00:00 2001 From: mprahl Date: Mon, 5 Feb 2018 22:05:52 -0500 Subject: [PATCH] Use a random build_id instead of an incrementing one in FakeModuleBuilder I ran into issues on CentOS CI where fake Koji build messages were getting one ID but the task_id for the component in the database was getting another. Making the build_id random and not tied to the class seems to resolve that issue. --- tests/test_build/test_build.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/test_build/test_build.py b/tests/test_build/test_build.py index 50cce07d..d1ec7e66 100644 --- a/tests/test_build/test_build.py +++ b/tests/test_build/test_build.py @@ -93,9 +93,6 @@ class FakeModuleBuilder(GenericBuilder): """ backend = "test" - # Global build_id/task_id we increment when new build is executed. - _build_id = 0 - BUILD_STATE = "COMPLETE" # Simulates a situation when a component is already built in Koji INSTANT_COMPLETE = False @@ -229,18 +226,17 @@ class FakeModuleBuilder(GenericBuilder): def build(self, artifact_name, source): print("Starting building artifact %s: %s" % (artifact_name, source)) - FakeModuleBuilder._build_id += 1 + build_id = randint(1000, 9999999) if FakeModuleBuilder.on_build_cb: FakeModuleBuilder.on_build_cb(self, artifact_name, source) if FakeModuleBuilder.BUILD_STATE != "BUILDING": self._send_build_change( - koji.BUILD_STATES[FakeModuleBuilder.BUILD_STATE], artifact_name, - FakeModuleBuilder._build_id) + koji.BUILD_STATES[FakeModuleBuilder.BUILD_STATE], artifact_name, build_id) reason = "Submitted %s to Koji" % (artifact_name) - return FakeModuleBuilder._build_id, koji.BUILD_STATES['BUILDING'], reason, None + return build_id, koji.BUILD_STATES['BUILDING'], reason, None @staticmethod def get_disttag_srpm(disttag, module_build):