Merge ~sudeephb/charm-prometheus-alertmanager:unittest_fix into charm-prometheus-alertmanager:master

Proposed by Sudeep Bhandari
Status: Merged
Approved by: Ramesh Sattaru
Approved revision: b74426c1f470d62d2a2e32ea8a30d30f1263fc01
Merged at revision: ad28b271cf03aed41094530e7079f320ef2bb41f
Proposed branch: ~sudeephb/charm-prometheus-alertmanager:unittest_fix
Merge into: charm-prometheus-alertmanager:master
Diff against target: 25 lines (+2/-4)
2 files modified
src/tests/unit/requirements.txt (+0/-1)
src/tests/unit/test_reactive_alertmanager.py (+2/-3)
Reviewer Review Type Date Requested Status
Ramesh Sattaru (community) Approve
Erhan Sunar (community) Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Review via email: mp+436510@code.launchpad.net

Commit message

Use unittest.mock instead of external mock library.

Description of the change

Use unittest.mock instead of mock(https://pypi.org/project/mock/). This fixes the failing unittests.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :
review: Approve (continuous-integration)
Revision history for this message
Erhan Sunar (esunar) :
review: Approve
Revision history for this message
Ramesh Sattaru (rameshcan) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision ad28b271cf03aed41094530e7079f320ef2bb41f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/tests/unit/requirements.txt b/src/tests/unit/requirements.txt
2index 2a72053..b6c8eca 100644
3--- a/src/tests/unit/requirements.txt
4+++ b/src/tests/unit/requirements.txt
5@@ -1,5 +1,4 @@
6 coverage
7-mock
8 nose
9 flake8
10 ipython
11diff --git a/src/tests/unit/test_reactive_alertmanager.py b/src/tests/unit/test_reactive_alertmanager.py
12index 90267ac..1b24bb1 100644
13--- a/src/tests/unit/test_reactive_alertmanager.py
14+++ b/src/tests/unit/test_reactive_alertmanager.py
15@@ -3,9 +3,8 @@ import shutil
16 import sys
17 import tempfile
18 import unittest
19-
20-import mock
21-from mock import call
22+import unittest.mock as mock
23+from unittest.mock import call
24
25 import yaml
26

Subscribers

People subscribed via source and target branches

to all changes: