Merge branch 'master' of ssh://pwan.org/var/www/git/projects/margebot

[margebot.git] / tests / test_marge.py

diff --git a/tests/test_marge.py b/tests/test_marge.py
index 8aed0ba..8e9d450 100644 (file)
--- a/tests/test_marge.py
+++ b/tests/test_marge.py
@@ -13,11 +13,11 @@ from datetime import datetime
 import logging
 import json
 
-import pytest
 import errbot
 from errbot.backends.test import testbot   # pylint: disable=unused-import
 import gitlab
 from dateutil.relativedelta import relativedelta
+import pytest
 from plugins.marge import deltastr
 
 
@@ -33,7 +33,7 @@ class TestMarge(object):
 
     @pytest.fixture
     def margebot(self, testbot, monkeypatch, mocker):
-        testbot.push_message("!plugin config Marge {'CHATROOM_HOST': 'conference.test.com', 'GITLAB_HOST': 'gitlab.test.com', 'GITLAB_ADMIN_TOKEN': 'fake-token', 'CRONTAB':  '0 * * * *', 'VERIFY_SSL': True, 'CRONTAB_SOAK_HOURS': 1}")
+        testbot.push_message("!plugin config Marge {'CHATROOM_HOST': 'conference.test.com', 'GITLAB_HOST': 'gitlab.test.com', 'GITLAB_ADMIN_TOKEN': 'fake-token', 'CRONTAB':  '0 * * * *', 'VERIFY_SSL': True, 'CRONTAB_SOAK_HOURS': 1, 'WEBHOOK_URL': 'https://webhood.errbot.com:3142/margebot'}")
         testbot.pop_message()
         testbot.push_message("!plugin config Webserver {'HOST': '0.0.0.0', 'PORT':3141, 'SSL': {'certificate': '', 'enabled': False, 'host': '0.0.0.0', 'key': '', 'port': 3142}}")
         testbot.pop_message()