Skip to content

Commit

Permalink
Rename flag for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
tcarmet committed Jan 26, 2024
1 parent 60a73c3 commit 8ee3fad
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion bert_e/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='')
Expand Down
3 changes: 2 additions & 1 deletion bert_e/tests/test_bert_e.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bert_e/workflow/gitwaterflow/queueing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8ee3fad

Please sign in to comment.