|
10 | 10 |
|
11 | 11 | from landoapi import patches |
12 | 12 | from landoapi.hg import AUTOFORMAT_COMMIT_MESSAGE, HgRepo |
13 | | -from landoapi.landing_worker import LandingWorker |
| 13 | +from landoapi.workers.landing_worker import LandingWorker |
14 | 14 | from landoapi.models.landing_job import LandingJob, LandingJobStatus |
15 | 15 | from landoapi.models.transplant import Transplant, TransplantStatus |
16 | 16 | from landoapi.repos import Repo, SCM_LEVEL_3 |
@@ -382,7 +382,7 @@ def test_integrated_execute_job( |
382 | 382 | # Mock `phab_trigger_repo_update` so we can make sure that it was called. |
383 | 383 | mock_trigger_update = mock.MagicMock() |
384 | 384 | monkeypatch.setattr( |
385 | | - "landoapi.landing_worker.LandingWorker.phab_trigger_repo_update", |
| 385 | + "landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update", |
386 | 386 | mock_trigger_update, |
387 | 387 | ) |
388 | 388 |
|
@@ -463,7 +463,7 @@ def test_failed_landing_job_notification( |
463 | 463 | # Mock `notify_user_of_landing_failure` so we can make sure that it was called. |
464 | 464 | mock_notify = mock.MagicMock() |
465 | 465 | 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 |
467 | 467 | ) |
468 | 468 |
|
469 | 469 | assert worker.run_job(job, repo, hgrepo, treestatus, "landoapi.test.bucket") |
@@ -569,7 +569,7 @@ def test_format_patch_success_unchanged( |
569 | 569 | # Mock `phab_trigger_repo_update` so we can make sure that it was called. |
570 | 570 | mock_trigger_update = mock.MagicMock() |
571 | 571 | monkeypatch.setattr( |
572 | | - "landoapi.landing_worker.LandingWorker.phab_trigger_repo_update", |
| 572 | + "landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update", |
573 | 573 | mock_trigger_update, |
574 | 574 | ) |
575 | 575 |
|
@@ -634,7 +634,7 @@ def test_format_single_success_changed( |
634 | 634 | # Mock `phab_trigger_repo_update` so we can make sure that it was called. |
635 | 635 | mock_trigger_update = mock.MagicMock() |
636 | 636 | monkeypatch.setattr( |
637 | | - "landoapi.landing_worker.LandingWorker.phab_trigger_repo_update", |
| 637 | + "landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update", |
638 | 638 | mock_trigger_update, |
639 | 639 | ) |
640 | 640 |
|
@@ -718,7 +718,7 @@ def test_format_stack_success_changed( |
718 | 718 | # Mock `phab_trigger_repo_update` so we can make sure that it was called. |
719 | 719 | mock_trigger_update = mock.MagicMock() |
720 | 720 | monkeypatch.setattr( |
721 | | - "landoapi.landing_worker.LandingWorker.phab_trigger_repo_update", |
| 721 | + "landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update", |
722 | 722 | mock_trigger_update, |
723 | 723 | ) |
724 | 724 |
|
@@ -799,7 +799,7 @@ def test_format_patch_fail( |
799 | 799 | # Mock `notify_user_of_landing_failure` so we can make sure that it was called. |
800 | 800 | mock_notify = mock.MagicMock() |
801 | 801 | 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 |
803 | 803 | ) |
804 | 804 |
|
805 | 805 | assert not worker.run_job( |
@@ -857,14 +857,14 @@ def test_format_patch_no_landoini( |
857 | 857 | # Mock `phab_trigger_repo_update` so we can make sure that it was called. |
858 | 858 | mock_trigger_update = mock.MagicMock() |
859 | 859 | monkeypatch.setattr( |
860 | | - "landoapi.landing_worker.LandingWorker.phab_trigger_repo_update", |
| 860 | + "landoapi.workers.landing_worker.LandingWorker.phab_trigger_repo_update", |
861 | 861 | mock_trigger_update, |
862 | 862 | ) |
863 | 863 |
|
864 | 864 | # Mock `notify_user_of_landing_failure` so we can make sure that it was called. |
865 | 865 | mock_notify = mock.MagicMock() |
866 | 866 | 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 |
868 | 868 | ) |
869 | 869 |
|
870 | 870 | assert worker.run_job(job, repo, hgrepo, treestatus, "landoapi.test.bucket") |
|
0 commit comments