Merge ~cjwatson/launchpad:fix-py3only-unittest-mock into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: b61289cc6b036703d17407712dedabdc54f31cdb
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-py3only-unittest-mock
Merge into: launchpad:master
Diff against target: 32 lines (+2/-2)
2 files modified
lib/lp/archivepublisher/tests/test_signing.py (+1/-1)
lib/lp/services/librarianserver/tests/test_swift.py (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+407193@code.launchpad.net

Commit message

Fix a couple of stray uses of mock

Description of the change

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving a trivial test fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/archivepublisher/tests/test_signing.py b/lib/lp/archivepublisher/tests/test_signing.py
2index 505b937..95e314a 100644
3--- a/lib/lp/archivepublisher/tests/test_signing.py
4+++ b/lib/lp/archivepublisher/tests/test_signing.py
5@@ -11,12 +11,12 @@ import re
6 import shutil
7 import stat
8 import tarfile
9+from unittest.mock import call
10
11 from fixtures import (
12 MockPatch,
13 MonkeyPatch,
14 )
15-from mock import call
16 from pytz import utc
17 import scandir
18 import six
19diff --git a/lib/lp/services/librarianserver/tests/test_swift.py b/lib/lp/services/librarianserver/tests/test_swift.py
20index f3513e7..d38207b 100644
21--- a/lib/lp/services/librarianserver/tests/test_swift.py
22+++ b/lib/lp/services/librarianserver/tests/test_swift.py
23@@ -9,8 +9,8 @@ import hashlib
24 import io
25 import os.path
26 import time
27+from unittest.mock import patch
28
29-from mock import patch
30 import six
31 from swiftclient import client as swiftclient
32 import transaction

Subscribers

People subscribed via source and target branches

to status/vote changes: