test: silent info/warning that were polluting the output
This commit is contained in:
parent
db832c1f6b
commit
cd45ede2d2
1 changed files with 34 additions and 15 deletions
|
|
@ -29,6 +29,7 @@ from copy import deepcopy
|
|||
from twisted.internet import defer
|
||||
from wokkel.generic import parseXml
|
||||
from twisted.words.protocols.jabber.jid import JID
|
||||
import logging
|
||||
|
||||
|
||||
class XEP_0033Test(helpers.SatTestCase):
|
||||
|
|
@ -108,6 +109,9 @@ class XEP_0033Test(helpers.SatTestCase):
|
|||
for to_s in [addresses[1], addresses[3], addresses[5]]:
|
||||
to_jid = JID(to_s)
|
||||
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 host not in cache:
|
||||
sent.append(host)
|
||||
|
|
@ -117,17 +121,25 @@ class XEP_0033Test(helpers.SatTestCase):
|
|||
else:
|
||||
sent.append(to_jid)
|
||||
stored.append(to_jid)
|
||||
logger.setLevel(level)
|
||||
msg = "/!\ see the comments in XEP_0033.sendAndStoreMessage"
|
||||
self.assertEqualUnsortedList(self.host.sent_messages, sent, 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
|
||||
self.host.memory.init()
|
||||
treatments = defer.Deferred()
|
||||
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.callback(data)
|
||||
|
||||
# feature is supported
|
||||
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])
|
||||
treatments = defer.Deferred()
|
||||
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.callback(data)
|
||||
checkSentAndStored()
|
||||
|
||||
# check that a wrong recipient entity is fixed by the backend
|
||||
|
|
@ -147,7 +158,6 @@ class XEP_0033Test(helpers.SatTestCase):
|
|||
treatments = defer.Deferred()
|
||||
data = deepcopy(mess_data)
|
||||
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.callback(mess_data)
|
||||
checkSentAndStored()
|
||||
|
|
|
|||
Loading…
Reference in a new issue