make sure to stop conpool between sensitive unitests

tsnoam · tsnoam · commit a814e9de6bdc · 2016-06-18T00:50:44.000+03:00
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -49,10 +49,19 @@ def _get_con_pool():
         ])
     return _CON_POOL
 
+
 def is_con_pool_initialized():
     return _CON_POOL is not None
 
 
+def stop_con_pool():
+    global _CON_POOL
+    if _CON_POOL is not None:
+        _CON_POOL.close()
+        _CON_POOL = None
+
+
+
 def _parse(json_data):
     """Try and parse the JSON returned from Telegram.
 
diff --git a/tests/test_jobqueue.py b/tests/test_jobqueue.py
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 # encoding: utf-8
 #
@@ -31,6 +32,7 @@
 
 sys.path.append('.')
 
+from telegram.utils.request import stop_con_pool
 from telegram.ext import JobQueue, Updater
 from tests.base import BaseTest
 
@@ -58,6 +60,7 @@ def setUp(self):
     def tearDown(self):
         if self.jq is not None:
             self.jq.stop()
+        stop_con_pool()
 
     def job1(self, bot):
         self.result += 1
diff --git a/tests/test_updater.py b/tests/test_updater.py
@@ -48,6 +48,7 @@
 sys.path.append('.')
 
 from telegram import Update, Message, TelegramError, User, Chat, Bot
+from telegram.utils.request import stop_con_pool
 from telegram.ext import *
 from telegram.ext.dispatcher import run_async
 from telegram.error import Unauthorized, InvalidToken
@@ -84,6 +85,7 @@ def _setup_updater(self, *args, **kwargs):
     def tearDown(self):
         if self.updater is not None:
             self.updater.stop()
+        stop_con_pool()
 
     def reset(self):
         self.message_count = 0
