Merge branch 'fix-test-order-race' into 'master'

tests: fix prerequisites for stanza tests

See merge request poezio/slixmpp!134

tests/test_stanza_message.py

@@ -2,6 +2,7 @@ import unittest
 from slixmpp.test import SlixTest
 from slixmpp.stanza.message import Message
 from slixmpp.stanza.htmlim import HTMLIM
+from slixmpp.plugins.xep_0172 import UserNick
 from slixmpp.xmlstream import register_stanza_plugin
 
 
@@ -9,6 +10,7 @@ class TestMessageStanzas(SlixTest):
 
     def setUp(self):
         register_stanza_plugin(Message, HTMLIM)
+        register_stanza_plugin(Message, UserNick)
 
     def testGroupchatReplyRegression(self):
         "Regression groupchat reply should be to barejid"

tests/test_stanza_presence.py

@@ -2,6 +2,12 @@ import unittest
 import slixmpp
 from slixmpp.test import SlixTest
 
+from slixmpp.plugins.xep_0172 import UserNick
+from slixmpp.xmlstream import register_stanza_plugin
+from slixmpp.stanza import Presence
+
+register_stanza_plugin(Presence, UserNick)
+
 class TestPresenceStanzas(SlixTest):
 
     def testPresenceShowRegression(self):

tests/test_stanza_xep_0060.py

@@ -3,10 +3,19 @@ from slixmpp.test import SlixTest
 import slixmpp.plugins.xep_0004 as xep_0004
 import slixmpp.plugins.xep_0060.stanza as pubsub
 from slixmpp.xmlstream.stanzabase import ET
+from slixmpp.xmlstream import register_stanza_plugin
 
 
 class TestPubsubStanzas(SlixTest):
 
+    def setUp(self):
+        register_stanza_plugin(
+            xep_0004.FormField, xep_0004.FieldOption, iterable=True
+        )
+        register_stanza_plugin(
+            xep_0004.Form, xep_0004.FormField, iterable=True
+        )
+
     def testAffiliations(self):
         "Testing iq/pubsub/affiliations/affiliation stanzas"
         iq = self.Iq()

tests/test_stanza_xep_0424.py

@@ -2,11 +2,13 @@ import unittest
 from slixmpp import Message
 from slixmpp.test import SlixTest
 from slixmpp.plugins.xep_0424 import stanza
+from slixmpp.plugins.xep_0422 import stanza as astanza
 
 
 class TestRetraction(SlixTest):
 
     def setUp(self):
+        astanza.register_plugins()
         stanza.register_plugins()
 
     def testRetract(self):