1928565 - new lando: TypeError: LandingWorker.process_merge_conflict() takes 4 positional arguments but 5 were given

Status: RESOLVED FIXED

(Conduit :: Lando, defect)

Description

[Olivier Mehani [:shtrom]]

When trying to land a conflicting commit, the following stack trace is received.

lando.hg-landing-worker-1  | abort: patch failed to apply                                                              
lando.hg-landing-worker-1  |                                                                                           
lando.hg-landing-worker-1  | During handling of the above exception, another exception occurred:                       
lando.hg-landing-worker-1  |                                                                                           
lando.hg-landing-worker-1  | Traceback (most recent call last):
lando.hg-landing-worker-1  |   File "/usr/local/bin/lando", line 8, in <module>
lando.hg-landing-worker-1  |     sys.exit(main())
lando.hg-landing-worker-1  |              ^^^^^^
lando.hg-landing-worker-1  |   File "/code/src/lando/manage.py", line 18, in main
lando.hg-landing-worker-1  |     execute_from_command_line(sys.argv)
lando.hg-landing-worker-1  |   File "/usr/local/lib/python3.12/site-packages/django/core/management/__init__.py", line 
442, in execute_from_command_line
lando.hg-landing-worker-1  |     utility.execute()
lando.hg-landing-worker-1  |   File "/usr/local/lib/python3.12/site-packages/django/core/management/__init__.py", line 
436, in execute
lando.hg-landing-worker-1  |     self.fetch_command(subcommand).run_from_argv(self.argv)
lando.hg-landing-worker-1  |   File "/usr/local/lib/python3.12/site-packages/django/core/management/base.py", line 413,
 in run_from_argv
lando.hg-landing-worker-1  |     self.execute(*args, **cmd_options)
lando.hg-landing-worker-1  |   File "/usr/local/lib/python3.12/site-packages/django/core/management/base.py", line 459,
 in execute
lando.hg-landing-worker-1  |     output = self.handle(*args, **options)
lando.hg-landing-worker-1  |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lando.hg-landing-worker-1  |   File "/code/src/lando/main/management/commands/start_landing_worker.py", line 66, in han
dle
lando.hg-landing-worker-1  |     handlers[worker.scm](worker)
lando.hg-landing-worker-1  |   File "/code/src/lando/main/management/commands/start_landing_worker.py", line 50, in han
dle_hg
lando.hg-landing-worker-1  |     worker.start()
lando.hg-landing-worker-1  |   File "/code/src/lando/api/legacy/workers/base.py", line 166, in start
lando.hg-landing-worker-1  |     self._start(max_loops=max_loops)
lando.hg-landing-worker-1  |   File "/code/src/lando/api/legacy/workers/base.py", line 139, in _start
lando.hg-landing-worker-1  |     self.loop(*args, **kwargs)
lando.hg-landing-worker-1  |   File "/code/src/lando/api/legacy/workers/landing_worker.py", line 104, in loop
lando.hg-landing-worker-1  |     self.last_job_finished = self.run_job(job)
lando.hg-landing-worker-1  |                              ^^^^^^^^^^^^^^^^^
lando.hg-landing-worker-1  |   File "/code/src/lando/api/legacy/workers/landing_worker.py", line 279, in run_job
lando.hg-landing-worker-1  |     breakdown = self.process_merge_conflict(
lando.hg-landing-worker-1  |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lando.hg-landing-worker-1  | TypeError: LandingWorker.process_merge_conflict() takes 4 positional arguments but 5 were 
given

Rough reproduction:
1.1 run in local-dev
1.2. create two commits changing the same file
1.3 moz-phab submit
1.4. land the first commit
2.1 restart local-dev
2.2 add a new commit to the same file (from the first commit)
2.3 moz-phab submit
3.1 land the second commit from the first stack
3.2 (try to) land the commit from the second stack
3.3 observer stacktrace in docker compose logs -f lando.hg-landing-worker

Comment 1

[Olivier Mehani [:shtrom]]

Attachment: GitHub Pull Request

Comment 2

[BMO Github Automation]

Attachment: [mozilla-conduit/lando] landing_worker: fix merge-conflict handling (bug 1928565) (#151)