summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormelissaml <ma.lei@99cloud.net>2019-01-06 17:48:39 +0800
committerMichaƂ Piotrowski <michal.piotrowski@ts.fujitsu.com>2019-02-08 15:49:23 +0100
commit226a070b4ab307f2e1db766f80858f3d915ad4cc (patch)
treee3bd03382a0d4e9bb612b206004b105234a849d2
parent4ffa8dee1d1d10a40d7752c7b2d77136cca1459a (diff)
Update hacking version to latest
Notes
Notes (review): Code-Review+2: Adrian Czarnecki <adrian.czarnecki@ts.fujitsu.com> Workflow+1: Adrian Czarnecki <adrian.czarnecki@ts.fujitsu.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 11 Feb 2019 13:20:31 +0000 Reviewed-on: https://review.openstack.org/628768 Project: openstack/monasca-notification Branch: refs/heads/master
-rw-r--r--test-requirements.txt2
-rw-r--r--tests/test_email_notification.py11
2 files changed, 6 insertions, 7 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 53b3732..a26ae65 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@
5 5
6bandit>=1.1.0 # Apache-2.0 6bandit>=1.1.0 # Apache-2.0
7Babel!=2.4.0,>=2.3.4 # BSD 7Babel!=2.4.0,>=2.3.4 # BSD
8hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 8hacking>=1.1.0,<1.2.0 # Apache-2.0
9coverage!=4.4,>=4.0 # Apache-2.0 9coverage!=4.4,>=4.0 # Apache-2.0
10mock>=2.0.0 # BSD 10mock>=2.0.0 # BSD
11funcsigs>=1.0.0;python_version=='2.7' or python_version=='2.6' # Apache-2.0 11funcsigs>=1.0.0;python_version=='2.7' or python_version=='2.6' # Apache-2.0
diff --git a/tests/test_email_notification.py b/tests/test_email_notification.py
index f108a8b..5935829 100644
--- a/tests/test_email_notification.py
+++ b/tests/test_email_notification.py
@@ -16,15 +16,18 @@
16# limitations under the License. 16# limitations under the License.
17 17
18import base64 18import base64
19import datetime
19import email.header 20import email.header
20import mock
21import smtplib 21import smtplib
22import socket 22import socket
23import time 23import time
24 24
25import mock
25import six 26import six
26 27
27import datetime 28from monasca_notification.notification import Notification
29from monasca_notification.plugins import email_notifier
30from tests import base
28 31
29if six.PY2: 32if six.PY2:
30 import urlparse 33 import urlparse
@@ -32,10 +35,6 @@ else:
32 from urllib import parse 35 from urllib import parse
33 from urllib.parse import urlparse 36 from urllib.parse import urlparse
34 37
35from monasca_notification.notification import Notification
36from monasca_notification.plugins import email_notifier
37from tests import base
38
39UNICODE_CHAR = six.unichr(2344) 38UNICODE_CHAR = six.unichr(2344)
40UNICODE_CHAR_ENCODED = UNICODE_CHAR.encode("utf-8") 39UNICODE_CHAR_ENCODED = UNICODE_CHAR.encode("utf-8")
41 40