From 7156b5d60d86a02639b5842bf1565887f9d316d5 Mon Sep 17 00:00:00 2001 From: Y0hy0h Date: Tue, 3 Oct 2017 15:58:33 +0200 Subject: [PATCH 1/2] Make tests pass --- ptbtest/mockbot.py | 4 +++- ptbtest/usergenerator.py | 6 ++++-- requirements.txt | 3 ++- tests/test_Mockbot.py | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ptbtest/mockbot.py b/ptbtest/mockbot.py index 86860fc..f09528e 100644 --- a/ptbtest/mockbot.py +++ b/ptbtest/mockbot.py @@ -26,6 +26,7 @@ import time +from ptbmock.mockrequest import MockRequest from telegram import (User, ReplyMarkup, TelegramObject) from telegram.error import TelegramError @@ -63,6 +64,7 @@ def __init__(self, username="MockBot", **kwargs): self._updates = [] self.bot = None self._username = username + self.request = MockRequest() self._sendmessages = [] from .messagegenerator import MessageGenerator from .chatgenerator import ChatGenerator @@ -190,7 +192,7 @@ def decorator(self, *args, **kwargs): return decorator def getMe(self, timeout=None, **kwargs): - self.bot = User(0, "Mockbot", last_name="Bot", username=self._username) + self.bot = User(0, "Mockbot", last_name="Bot", username=self._username, is_bot=True) return self.bot @message diff --git a/ptbtest/usergenerator.py b/ptbtest/usergenerator.py index ba4b0de..b6087f1 100644 --- a/ptbtest/usergenerator.py +++ b/ptbtest/usergenerator.py @@ -42,7 +42,7 @@ def __init__(self): PtbGenerator.__init__(self) def get_user(self, first_name=None, last_name=None, username=None, - id=None): + id=None, is_bot=False): """ Returns a telegram.User object with the optionally given name(s) or username If any of the arguments are omitted the names will be chosen randomly and the @@ -52,6 +52,7 @@ def get_user(self, first_name=None, last_name=None, username=None, first_name (Optional[str]): First name for the returned user. last_name (Optional[str]): Lst name for the returned user. username (Optional[str]): Username for the returned user. + is_bot (Optional[bool]): Whether the user is a bot. Returns: telegram.User: A telegram user object @@ -67,4 +68,5 @@ def get_user(self, first_name=None, last_name=None, username=None, id or self.gen_id(), first_name, last_name=last_name, - username=username) + username=username, + is_bot=is_bot) diff --git a/requirements.txt b/requirements.txt index 850869a..225e2ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -python-telegram-bot +python-telegram-bot==8.0 +-e git://github.com/Y0hy0h/PtbMock.git#egg=ptbmock diff --git a/tests/test_Mockbot.py b/tests/test_Mockbot.py index d00a703..b4fe29f 100644 --- a/tests/test_Mockbot.py +++ b/tests/test_Mockbot.py @@ -47,7 +47,7 @@ def start(bot, update): dp = updater.dispatcher dp.add_handler(CommandHandler("start", start)) updater.start_polling() - user = User(id=1, first_name="test") + user = User(id=1, first_name="test", is_bot=False) chat = Chat(45, "group") message = Message( 404, user, None, chat, text="/start", bot=self.mockbot) From 53178cfccc5feb6cac726b611d95e57f1653fc27 Mon Sep 17 00:00:00 2001 From: Y0hy0h Date: Tue, 3 Oct 2017 16:04:51 +0200 Subject: [PATCH 2/2] Fix setup.py --- setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 24bd8fe..ff75929 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,7 @@ import codecs from distutils.core import setup -from setuptools import find_packages - -with codecs.open("readme.rst", "r", "utf-8") as fd: +with codecs.open("readme.MD", "r", "utf-8") as fd: setup( name='ptbtest',