Skip to content

Commit 0a55998

Browse files
authored
workers: move landing_worker module (bug 1819145) (#275)
1 parent c6d055f commit 0a55998

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

landoapi/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def landing_worker():
9191
for system in get_subsystems(exclude=exclusions):
9292
system.ensure_ready()
9393

94-
from landoapi.landing_worker import LandingWorker
94+
from landoapi.workers.landing_worker import LandingWorker
9595

9696
worker = LandingWorker()
9797
worker.start()

landoapi/workers/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# This Source Code Form is subject to the terms of the Mozilla Public
2+
# License, v. 2.0. If a copy of the MPL was not distributed with this
3+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

tests/test_landings.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from landoapi import patches
1212
from landoapi.hg import AUTOFORMAT_COMMIT_MESSAGE, HgRepo
13-
from landoapi.landing_worker import LandingWorker
13+
from landoapi.workers.landing_worker import LandingWorker
1414
from landoapi.models.landing_job import LandingJob, LandingJobStatus
1515
from landoapi.models.transplant import Transplant, TransplantStatus
1616
from landoapi.repos import Repo, SCM_LEVEL_3
@@ -382,7 +382,7 @@ def test_integrated_execute_job(
382382
# Mock `phab_trigger_repo_update` so we can make sure that it was called.
383383
mock_trigger_update = mock.MagicMock()
384384
monkeypatch.setattr(
385-
"landoapi.landing_worker.LandingWorker.phab_trigger_repo_update",
385+
"landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update",
386386
mock_trigger_update,
387387
)
388388

@@ -463,7 +463,7 @@ def test_failed_landing_job_notification(
463463
# Mock `notify_user_of_landing_failure` so we can make sure that it was called.
464464
mock_notify = mock.MagicMock()
465465
monkeypatch.setattr(
466-
"landoapi.landing_worker.notify_user_of_landing_failure", mock_notify
466+
"landoapi.workers.landing_worker.notify_user_of_landing_failure", mock_notify
467467
)
468468

469469
assert worker.run_job(job, repo, hgrepo, treestatus, "landoapi.test.bucket")
@@ -569,7 +569,7 @@ def test_format_patch_success_unchanged(
569569
# Mock `phab_trigger_repo_update` so we can make sure that it was called.
570570
mock_trigger_update = mock.MagicMock()
571571
monkeypatch.setattr(
572-
"landoapi.landing_worker.LandingWorker.phab_trigger_repo_update",
572+
"landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update",
573573
mock_trigger_update,
574574
)
575575

@@ -634,7 +634,7 @@ def test_format_single_success_changed(
634634
# Mock `phab_trigger_repo_update` so we can make sure that it was called.
635635
mock_trigger_update = mock.MagicMock()
636636
monkeypatch.setattr(
637-
"landoapi.landing_worker.LandingWorker.phab_trigger_repo_update",
637+
"landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update",
638638
mock_trigger_update,
639639
)
640640

@@ -718,7 +718,7 @@ def test_format_stack_success_changed(
718718
# Mock `phab_trigger_repo_update` so we can make sure that it was called.
719719
mock_trigger_update = mock.MagicMock()
720720
monkeypatch.setattr(
721-
"landoapi.landing_worker.LandingWorker.phab_trigger_repo_update",
721+
"landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update",
722722
mock_trigger_update,
723723
)
724724

@@ -799,7 +799,7 @@ def test_format_patch_fail(
799799
# Mock `notify_user_of_landing_failure` so we can make sure that it was called.
800800
mock_notify = mock.MagicMock()
801801
monkeypatch.setattr(
802-
"landoapi.landing_worker.notify_user_of_landing_failure", mock_notify
802+
"landoapi.workers.landing_worker.notify_user_of_landing_failure", mock_notify
803803
)
804804

805805
assert not worker.run_job(
@@ -857,14 +857,14 @@ def test_format_patch_no_landoini(
857857
# Mock `phab_trigger_repo_update` so we can make sure that it was called.
858858
mock_trigger_update = mock.MagicMock()
859859
monkeypatch.setattr(
860-
"landoapi.landing_worker.LandingWorker.phab_trigger_repo_update",
860+
"landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update",
861861
mock_trigger_update,
862862
)
863863

864864
# Mock `notify_user_of_landing_failure` so we can make sure that it was called.
865865
mock_notify = mock.MagicMock()
866866
monkeypatch.setattr(
867-
"landoapi.landing_worker.notify_user_of_landing_failure", mock_notify
867+
"landoapi.workers.landing_worker.notify_user_of_landing_failure", mock_notify
868868
)
869869

870870
assert worker.run_job(job, repo, hgrepo, treestatus, "landoapi.test.bucket")

0 commit comments

Comments
 (0)