← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~twom/launchpad:tasks-fix-py2-mock-import into launchpad:master

 

Tom Wardill has proposed merging ~twom/launchpad:tasks-fix-py2-mock-import into launchpad:master.

Commit message:
Fix mock import

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/403054
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/launchpad:tasks-fix-py2-mock-import into launchpad:master.
diff --git a/lib/lp/services/job/tests/test_celery.py b/lib/lp/services/job/tests/test_celery.py
index 014a1c4..e5df169 100644
--- a/lib/lp/services/job/tests/test_celery.py
+++ b/lib/lp/services/job/tests/test_celery.py
@@ -9,7 +9,6 @@ from datetime import (
     timedelta,
     )
 from time import sleep
-from unittest import mock
 
 import iso8601
 from lazr.delegates import delegate_to
@@ -25,6 +24,7 @@ from testtools.matchers import (
 import transaction
 from zope.interface import implementer
 
+from lp.services.compat import mock
 from lp.services.config import config
 from lp.services.database.interfaces import IStore
 from lp.services.features.testing import FeatureFixture