Merged release/2.1.3 into master

iktakahiro · Apr 28, 2016 · 3f0142a · 3f0142a
2 parents eb7f854 + 43d6884
commit 3f0142a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name="slackpy",
-    version="2.1.1",
+    version="2.1.3",
     packages=['slackpy'],
     install_requires=requires,
     extras_require=extras_requires,

diff --git a/slackpy/slackpy.py b/slackpy/slackpy.py
@@ -87,7 +87,7 @@ def __send_notification(self, message, title, title_link='', color='good',
 
         try:
             response = requests.post(self.web_hook_url,
-                                     data=json.dumps(payload), allow_redirects=False)
+                                     data=json.dumps(payload), timeout=3, allow_redirects=False)
 
         except Exception:
             raise Exception(traceback.format_exc())

diff --git a/tests/test_slackpy.py b/tests/test_slackpy.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+import time
 import pytest
 from slackpy.slackpy import SlackLogger, LOG_LEVELS, LogLv
 
@@ -169,18 +170,23 @@ def test_post_to_valid_web_hook(self):
         }
         ]
 
+        time.sleep(2)
         response = logger.debug('DEBUG', 'test_post_to_valid_web_hook', fields=fields)
         assert response.status_code == 200
 
+        time.sleep(2)
         response = logger.info('INFO', 'test_post_to_valid_web_hook', fields=fields)
         assert response.status_code == 200
 
+        time.sleep(2)
         response = logger.warn('WARN', 'test_post_to_valid_web_hook', fields=fields)
         assert response.status_code == 200
 
+        time.sleep(2)
         response = logger.error('ERROR', 'test_post_to_valid_web_hook', fields=fields)
         assert response.status_code == 200
 
+        time.sleep(2)
         response = logger.message('CUSTOM', 'test_post_to_valid_web_hook',
                                   title_link='https://github.com/iktakahiro/slackpy',
                                   fields=fields, color='warning', log_level=20)
@@ -189,24 +195,28 @@ def test_post_to_valid_web_hook(self):
     def test_post_to_invalid_web_hook(self):
         logger = SlackLogger(DUMMY_WEB_HOOK)
 
+        time.sleep(2)
         with pytest.raises(Exception) as exc_info:
             logger.error('Test Message', 'Test Title')
         assert 'Failed' in str(exc_info.value)
 
     def test_title_link(self):
         logger = SlackLogger(VALID_WEB_HOOK)
 
+        time.sleep(2)
         response = logger.info('test_title_link', 'slackpy repository', 'https://github.com/iktakahiro/slackpy')
         assert response.status_code == 200
 
     def test_omit_title_link(self):
         logger = SlackLogger(VALID_WEB_HOOK)
 
+        time.sleep(2)
         response = logger.info('test_omit_title_link', 'slackpy repository')
         assert response.status_code == 200
 
     def test_minimum_post_to_valid_web_hook(self):
         logger = SlackLogger(VALID_WEB_HOOK)
 
+        time.sleep(2)
         response = logger.info('test_minimum_post_to_valid_web_hook')
         assert response.status_code == 200