From 73461c8f2916c158c6de9d0efb420aeef9d08e83 Mon Sep 17 00:00:00 2001 From: Thomas Carmet <8408330+tcarmet@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:20:40 +0000 Subject: [PATCH] fix more queueing tests --- bert_e/tests/test_bert_e.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bert_e/tests/test_bert_e.py b/bert_e/tests/test_bert_e.py index 4210c94d..d77acedd 100644 --- a/bert_e/tests/test_bert_e.py +++ b/bert_e/tests/test_bert_e.py @@ -5181,8 +5181,11 @@ def test_queueing_last_pr_build_not_started(self): problem[4]['status'][2] = {} solution = deepcopy(self.standard_solution) solution[(4, 3)][gwfb.QueueIntegrationBranch].pop(0) + solution[(4, None)][gwfb.QueueIntegrationBranch].pop(0) solution[(5, 1)][gwfb.QueueIntegrationBranch].pop(0) + solution[(5, None)][gwfb.QueueIntegrationBranch].pop(0) solution[(10, 0)][gwfb.QueueIntegrationBranch].pop(0) + solution[(10, None)][gwfb.QueueIntegrationBranch].pop(0) qbranches = self.submit_problem(problem) qc = self.feed_queue_collection(qbranches) qc.finalize() @@ -5197,8 +5200,11 @@ def test_queueing_last_pr_build_failed(self): problem[4]['status'][2] = {'pipeline': 'FAILED'} solution = deepcopy(self.standard_solution) solution[(4, 3)][gwfb.QueueIntegrationBranch].pop(0) + solution[(4, None)][gwfb.QueueIntegrationBranch].pop(0) solution[(5, 1)][gwfb.QueueIntegrationBranch].pop(0) + solution[(5, None)][gwfb.QueueIntegrationBranch].pop(0) solution[(10, 0)][gwfb.QueueIntegrationBranch].pop(0) + solution[(10, None)][gwfb.QueueIntegrationBranch].pop(0) qbranches = self.submit_problem(problem) qc = self.feed_queue_collection(qbranches) qc.finalize() @@ -5392,7 +5398,7 @@ def test_validation_masterq_diverged(self): def test_validation_vertical_inclusion(self): qbranches = self.submit_problem(self.standard_problem) - add_file_to_branch(self.gitrepo, 'q/w/7/5.1/improvement/bar2', + add_file_to_branch(self.gitrepo, 'q/w/13/5.1/improvement/bar2', 'file_pushed_without_bert-e.txt', do_push=True) qc = self.feed_queue_collection(qbranches) qc.finalize()