erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: silent info/warning that were polluting the output

Browse source
This commit is contained in:
souliane 2014-01-10 18:19:34 +01:00
commit cd45ede2d2
2 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/test/test_memory.py
View file

@ -21,6 +21,7 @@ from sat.core.i18n import _
from sat.test import helpers from sat.test import helpers
from twisted.trial import unittest from twisted.trial import unittest
import traceback import traceback
import logging
from constants import Const from constants import Const
from xml.dom import minidom from xml.dom import minidom
@ -135,38 +136,46 @@ class MemoryTest(unittest.TestCase):
self._getParams(1).addCallback(self.assertParamExists_async) self._getParams(1).addCallback(self.assertParamExists_async)
def test_paramsRegisterApp(self): def test_paramsRegisterApp(self):
def register(*args):
logger = logging.getLogger()
level = logger.getEffectiveLevel()
logger.setLevel(logging.INFO)
self.host.memory.paramsRegisterApp(*args)
logger.setLevel(level)
# tests with no security level on the parameter (most secure) # tests with no security level on the parameter (most secure)
params = self._getParamXML() params = self._getParamXML()
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, Const.NO_SECURITY_LIMIT, Const.APP_NAME) register(params, Const.NO_SECURITY_LIMIT, Const.APP_NAME)
self.assertParamExists() self.assertParamExists()
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, 0, Const.APP_NAME) register(params, 0, Const.APP_NAME)
self.assertParamNotExists() self.assertParamNotExists()
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, 1, Const.APP_NAME) register(params, 1, Const.APP_NAME)
self.assertParamNotExists() self.assertParamNotExists()
# tests with security level 0 on the parameter (not secure) # tests with security level 0 on the parameter (not secure)
params = self._getParamXML(security_level=0) params = self._getParamXML(security_level=0)
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, Const.NO_SECURITY_LIMIT, Const.APP_NAME) register(params, Const.NO_SECURITY_LIMIT, Const.APP_NAME)
self.assertParamExists() self.assertParamExists()
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, 0, Const.APP_NAME) register(params, 0, Const.APP_NAME)
self.assertParamExists() self.assertParamExists()
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, 1, Const.APP_NAME) register(params, 1, Const.APP_NAME)
self.assertParamExists() self.assertParamExists()
# tests with security level 1 on the parameter (more secure) # tests with security level 1 on the parameter (more secure)
params = self._getParamXML(security_level=1) params = self._getParamXML(security_level=1)
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, Const.NO_SECURITY_LIMIT, Const.APP_NAME) register(params, Const.NO_SECURITY_LIMIT, Const.APP_NAME)
self.assertParamExists() self.assertParamExists()
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, 0, Const.APP_NAME) register(params, 0, Const.APP_NAME)
self.assertParamNotExists() self.assertParamNotExists()
self.host.memory.init() self.host.memory.init()
self.host.memory.paramsRegisterApp(params, 1, Const.APP_NAME) register(params, 1, Const.APP_NAME)
self.assertParamExists() self.assertParamExists()
def test_paramsRegisterApp_getParams(self): def test_paramsRegisterApp_getParams(self):

22
src/test/test_plugin_xep_0033.py
View file

@ -29,6 +29,7 @@ from copy import deepcopy
from twisted.internet import defer from twisted.internet import defer
from wokkel.generic import parseXml from wokkel.generic import parseXml
from twisted.words.protocols.jabber.jid import JID from twisted.words.protocols.jabber.jid import JID
import logging
class XEP_0033Test(helpers.SatTestCase): class XEP_0033Test(helpers.SatTestCase):
@ -108,6 +109,9 @@ class XEP_0033Test(helpers.SatTestCase):
for to_s in [addresses[1], addresses[3], addresses[5]]: for to_s in [addresses[1], addresses[3], addresses[5]]:
to_jid = JID(to_s) to_jid = JID(to_s)
host = JID(to_jid.host) host = JID(to_jid.host)
logger = logging.getLogger()
level = logger.getEffectiveLevel()
logger.setLevel(logging.ERROR) # remove warning pollution
if self.host.memory.hasServerFeature(plugin.NS_ADDRESS, host, Const.PROFILE[0]): if self.host.memory.hasServerFeature(plugin.NS_ADDRESS, host, Const.PROFILE[0]):
if host not in cache: if host not in cache:
sent.append(host) sent.append(host)
@ -117,17 +121,25 @@ class XEP_0033Test(helpers.SatTestCase):
else: else:
sent.append(to_jid) sent.append(to_jid)
stored.append(to_jid) stored.append(to_jid)
logger.setLevel(level)
msg = "/!\ see the comments in XEP_0033.sendAndStoreMessage" msg = "/!\ see the comments in XEP_0033.sendAndStoreMessage"
self.assertEqualUnsortedList(self.host.sent_messages, sent, msg) self.assertEqualUnsortedList(self.host.sent_messages, sent, msg)
self.assertEqualUnsortedList(self.host.stored_messages, stored, msg) self.assertEqualUnsortedList(self.host.stored_messages, stored, msg)
def trigger(treatments, data, *args):
logger = logging.getLogger()
level = logger.getEffectiveLevel()
logger.setLevel(logging.ERROR) # remove warning pollution
self.plugin.sendMessageTrigger(*args)
treatments.callback(data)
logger.setLevel(level)
# feature is not supported, abort the message # feature is not supported, abort the message
self.host.memory.init() self.host.memory.init()
treatments = defer.Deferred() treatments = defer.Deferred()
data = deepcopy(mess_data) data = deepcopy(mess_data)
self.plugin.sendMessageTrigger(data, treatments, Const.PROFILE[0]) trigger(treatments, data, data, treatments, Const.PROFILE[0])
treatments.addCallbacks(assertAddresses, lambda failure: sendMessageErrback(failure, AbortSendMessage)) treatments.addCallbacks(assertAddresses, lambda failure: sendMessageErrback(failure, AbortSendMessage))
treatments.callback(data)
# feature is supported # feature is supported
self.host.init() self.host.init()
@ -135,9 +147,8 @@ class XEP_0033Test(helpers.SatTestCase):
self.host.memory.addServerFeature(plugin.NS_ADDRESS, self.host.getClientHostJid(Const.PROFILE[0]), Const.PROFILE[0]) self.host.memory.addServerFeature(plugin.NS_ADDRESS, self.host.getClientHostJid(Const.PROFILE[0]), Const.PROFILE[0])
treatments = defer.Deferred() treatments = defer.Deferred()
data = deepcopy(mess_data) data = deepcopy(mess_data)
self.plugin.sendMessageTrigger(data, treatments, Const.PROFILE[0]) trigger(treatments, data, data, treatments, Const.PROFILE[0])
treatments.addCallbacks(assertAddresses, lambda failure: sendMessageErrback(failure, MessageSentAndStored)) treatments.addCallbacks(assertAddresses, lambda failure: sendMessageErrback(failure, MessageSentAndStored))
treatments.callback(data)
checkSentAndStored() checkSentAndStored()
# check that a wrong recipient entity is fixed by the backend # check that a wrong recipient entity is fixed by the backend
@ -147,7 +158,6 @@ class XEP_0033Test(helpers.SatTestCase):
treatments = defer.Deferred() treatments = defer.Deferred()
data = deepcopy(mess_data) data = deepcopy(mess_data)
data["to"] = Const.JID[0] data["to"] = Const.JID[0]
self.plugin.sendMessageTrigger(data, treatments, Const.PROFILE[0]) trigger(treatments, mess_data, data, treatments, Const.PROFILE[0])
treatments.addCallbacks(assertAddresses, lambda failure: sendMessageErrback(failure, MessageSentAndStored)) treatments.addCallbacks(assertAddresses, lambda failure: sendMessageErrback(failure, MessageSentAndStored))
treatments.callback(mess_data)
checkSentAndStored() checkSentAndStored()