projects
/
margebot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Getting the unit tests passing again / fixing requirements.txt
[margebot.git]
/
tests
/
test_marge.py
diff --git
a/tests/test_marge.py
b/tests/test_marge.py
index
9ab5d90
..
6875007
100644
(file)
--- a/
tests/test_marge.py
+++ b/
tests/test_marge.py
@@
-15,10
+15,10
@@
import json
from queue import Empty
from dateutil.relativedelta import relativedelta
from queue import Empty
from dateutil.relativedelta import relativedelta
-import pytest
import requests
import requests
-import errbot
from errbot.backends.test import testbot # pylint: disable=unused-import
from errbot.backends.test import testbot # pylint: disable=unused-import
+import errbot
+import pytest
from httmock import urlmatch, HTTMock
from plugins.marge import deltastr
from httmock import urlmatch, HTTMock
from plugins.marge import deltastr
@@
-199,7
+199,7
@@
def mock_projects_hooks_list_already_watching(url, request):
'url': 'https://webhook.errbot.com:3142/margebot/room1,room2,room3'}])}
'url': 'https://webhook.errbot.com:3142/margebot/room1,room2,room3'}])}
-class TestMarge
(object)
:
+class TestMarge:
"""
Margebot Tests
"""
Margebot Tests