From 8ee3fad6c753e358b9b2b312f949d44400e92e07 Mon Sep 17 00:00:00 2001 From: Thomas Carmet <8408330+tcarmet@users.noreply.github.com> Date: Fri, 26 Jan 2024 19:34:28 +0000 Subject: [PATCH] Rename flag for consistency --- bert_e/settings.py | 3 ++- bert_e/tests/test_bert_e.py | 3 ++- bert_e/workflow/gitwaterflow/queueing.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bert_e/settings.py b/bert_e/settings.py index 69950059..b50e29fd 100644 --- a/bert_e/settings.py +++ b/bert_e/settings.py @@ -184,7 +184,8 @@ class Meta: quiet = fields.Bool(required=False, load_default=False) disable_queues = fields.Bool(required=False, load_default=False) use_queues = fields.Bool(required=False, load_default=True) - skip_queue_when_possible = fields.Bool(required=False, load_default=False) + skip_queue_when_not_needed = fields.Bool( + required=False, load_default=False) cmd_line_options = fields.List(fields.Str(), load_default=[]) client_id = fields.Str(required=False, load_default='') diff --git a/bert_e/tests/test_bert_e.py b/bert_e/tests/test_bert_e.py index 477b75a3..44d4e616 100644 --- a/bert_e/tests/test_bert_e.py +++ b/bert_e/tests/test_bert_e.py @@ -7696,7 +7696,8 @@ def test_no_need_queuing(self): # Two PRs created at the same time # At the moment they were created they are both up to date with the # destination branch - self.init_berte(options=self.bypass_all, skip_queue_when_possible=True) + self.init_berte( + options=self.bypass_all, skip_queue_when_not_needed=True) first_pr = self.create_pr('feature/TEST-1', 'development/4.3') second_pr = self.create_pr('feature/TEST-2', 'development/4.3') # The first PR is ready to merge, and is expected to merge directly diff --git a/bert_e/workflow/gitwaterflow/queueing.py b/bert_e/workflow/gitwaterflow/queueing.py index 28f8e579..08c08c0d 100644 --- a/bert_e/workflow/gitwaterflow/queueing.py +++ b/bert_e/workflow/gitwaterflow/queueing.py @@ -229,7 +229,7 @@ def is_needed( if queues is None or job.settings.use_queue is False: return False - if (job.settings.skip_queue_when_possible is False or + if (job.settings.skip_queue_when_not_needed is False or already_in_queue(job, wbranches) or len(queues.queued_prs) > 0): return True