test: add helpers methods muteLogging and unmuteLogging
This commit is contained in:
parent
cdff2852b4
commit
8bc634d4c2
1 changed files with 34 additions and 23 deletions
|
|
@ -24,7 +24,6 @@ from constants import Const
|
|||
from sat.test import helpers
|
||||
from sat.plugins import plugin_xep_0033 as plugin
|
||||
from sat.core.exceptions import CancelError
|
||||
from sat.core.log import getLogger
|
||||
from twisted.internet import defer
|
||||
from wokkel.generic import parseXml
|
||||
from twisted.words.protocols.jabber.jid import JID
|
||||
|
|
@ -108,7 +107,7 @@ class XEP_0033Test(helpers.SatTestCase):
|
|||
stored = []
|
||||
d_list = []
|
||||
|
||||
def cb(entities, to_jid, logger, level):
|
||||
def cb(entities, to_jid):
|
||||
if host in entities:
|
||||
if host not in sent: # send the message to the entity offering the feature
|
||||
sent.append(host)
|
||||
|
|
@ -117,16 +116,14 @@ class XEP_0033Test(helpers.SatTestCase):
|
|||
else: # feature not supported, use normal behavior
|
||||
sent.append(to_jid)
|
||||
stored.append(to_jid)
|
||||
logger.setLevel(level)
|
||||
helpers.unmuteLogging()
|
||||
|
||||
for to_s in (JID_STR_X_TO, JID_STR_X_CC, JID_STR_X_BCC):
|
||||
to_jid = JID(to_s)
|
||||
host = JID(to_jid.host)
|
||||
logger = getLogger()
|
||||
level = logger.getEffectiveLevel()
|
||||
logger.setLevel(ERROR) # remove log.warning pollution
|
||||
d = self.host.findFeaturesSet([plugin.NS_ADDRESS], jid_=host, profile_key=PROFILE)
|
||||
d.addCallback(cb, to_jid, logger, level)
|
||||
helpers.muteLogging()
|
||||
d = self.host.findFeaturesSet([plugin.NS_ADDRESS], jid_=host, profile=PROFILE)
|
||||
d.addCallback(cb, to_jid)
|
||||
d_list.append(d)
|
||||
|
||||
def cb_list(dummy):
|
||||
|
|
@ -144,14 +141,12 @@ class XEP_0033Test(helpers.SatTestCase):
|
|||
addressing information to the stanza.
|
||||
@param data: the data to be processed by self.plugin.sendMessageTrigger
|
||||
"""
|
||||
logger = getLogger()
|
||||
level = logger.getEffectiveLevel()
|
||||
logger.setLevel(ERROR) # remove log.warning pollution
|
||||
pre_treatments = defer.Deferred()
|
||||
post_treatments = defer.Deferred()
|
||||
helpers.muteLogging()
|
||||
self.plugin.sendMessageTrigger(data, pre_treatments, post_treatments, PROFILE)
|
||||
post_treatments.callback(data)
|
||||
logger.setLevel(level)
|
||||
helpers.unmuteLogging()
|
||||
post_treatments.addCallbacks(self._assertAddresses, lambda failure: failure.trap(CancelError))
|
||||
return post_treatments
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue