diff options
| author | mathieui <mathieui@mathieui.net> | 2015-10-02 19:07:45 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2015-10-02 19:07:45 +0200 |
| commit | ada9444bf84bd238238c4d22561f69184dd22cdd (patch) | |
| tree | ceb4f86446b4129ec22cb348f1cb1bd7a151e2da /slixmpp/test/slixtest.py | |
| parent | 1100ff1febf7e605e03fd9565bdac5fdaa3bf1e0 (diff) | |
| parent | acc52fd935b7e74919ad748f3a630596f66c62af (diff) | |
| download | slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.gz slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.bz2 slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.xz slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.zip | |
Merge branch 'sleek-merge'
Diffstat (limited to 'slixmpp/test/slixtest.py')
| -rw-r--r-- | slixmpp/test/slixtest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/slixmpp/test/slixtest.py b/slixmpp/test/slixtest.py index 19ef9ae6..f66cf6be 100644 --- a/slixmpp/test/slixtest.py +++ b/slixmpp/test/slixtest.py @@ -319,6 +319,9 @@ class SlixTest(unittest.TestCase): plugins -- List of plugins to register. By default, all plugins are loaded. """ + if not plugin_config: + plugin_config = {} + if mode == 'client': self.xmpp = ClientXMPP(jid, password, sasl_mech=sasl_mech, @@ -402,8 +405,7 @@ class SlixTest(unittest.TestCase): parts.append('xmlns="%s"' % default_ns) return header % ' '.join(parts) - def recv(self, data, defaults=[], method='exact', - use_values=True, timeout=1): + def recv(self, data, defaults=None, method='exact', use_values=True, timeout=1): """ Pass data to the dummy XMPP client as if it came from an XMPP server. |