fix tests

jh0ker · jh0ker · commit 86c8ebbfb7fb · 2017-01-16T00:28:47.000+01:00
diff --git a/tests/test_bot.py b/tests/test_bot.py
@@ -85,6 +85,7 @@ def test_sendMessage_no_web_page_preview(self):
     @flaky(3, 1)
     @timeout(10)
     def testGetUpdates(self):
+        self._bot.delete_webhook()  # make sure there is no webhook set if webhook tests failed
         updates = self._bot.getUpdates(timeout=1)
 
         if updates:
diff --git a/tests/test_updater.py b/tests/test_updater.py
@@ -801,15 +801,29 @@ def mockUpdate(self, text):
 
         return update
 
-    def setWebhook(self, webhook_url=None, certificate=None):
+    def setWebhook(self, url=None, certificate=None):
         if self.bootstrap_retries is None:
             return
 
         if self.bootstrap_attempts < self.bootstrap_retries:
             self.bootstrap_attempts += 1
             raise self.bootstrap_err
 
-    def getUpdates(self, offset=None, limit=100, timeout=0, network_delay=None, read_latency=2.):
+    def deleteWebhook(self):
+        if self.bootstrap_retries is None:
+            return
+
+        if self.bootstrap_attempts < self.bootstrap_retries:
+            self.bootstrap_attempts += 1
+            raise self.bootstrap_err
+
+    def getUpdates(self,
+                   offset=None,
+                   limit=100,
+                   timeout=0,
+                   network_delay=None,
+                   read_latency=2.,
+                   allowed_updates=None):
 
         if self.raise_error:
             raise TelegramError('Test Error 2')
