SaslTestCase: Change config instead of messing with irc.sasl_next_mec…

…hanisms

Changing the internal state will break in the next commit, which
reorganizes SASL state initialization

test/test_irclib.py

@@ -1494,29 +1494,41 @@ def testBatchInterleaved(self):
 
 class SaslTestCase(SupyTestCase, CapNegMixin):
     def setUp(self):
-        pass
+        self._default_mechanisms = conf.supybot.networks.test.sasl.mechanisms()
 
     def tearDown(self):
+        conf.supybot.networks.test.sasl.mechanisms.setValue(self._default_mechanisms)
         conf.supybot.networks.test.sasl.username.setValue('')
         conf.supybot.networks.test.sasl.password.setValue('')
         conf.supybot.networks.test.certfile.setValue('')
 
     def testPlain(self):
         conf.supybot.networks.test.sasl.username.setValue('jilles')
         conf.supybot.networks.test.sasl.password.setValue('sesame')
+        conf.supybot.networks.test.sasl.mechanisms.setValue(
+            ['scram-sha-256', 'plain'])
 
         self.irc = irclib.Irc('test')
 
         self.assertEqual(self.irc.sasl_current_mechanism, None)
-        self.irc.sasl_next_mechanisms = ['scram-sha-256', 'plain']
 
-        self.startCapNegociation()
+        if irclib.scram:
+            self.assertEqual(self.irc.sasl_next_mechanisms,
+                ['scram-sha-256', 'plain'])
+
+            self.startCapNegociation()
+
+            m = self.irc.takeMsg()
+            self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE',
+                args=('SCRAM-SHA-256',)))
+            self.irc.feedMsg(ircmsgs.IrcMsg(command='904',
+                args=('mechanism not available',)))
+        else:
+            self.assertEqual(self.irc.sasl_next_mechanisms,
+                ['plain'])
+
+            self.startCapNegociation()
 
-        m = self.irc.takeMsg()
-        self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE',
-            args=('SCRAM-SHA-256',)))
-        self.irc.feedMsg(ircmsgs.IrcMsg(command='904',
-            args=('mechanism not available',)))
 
         m = self.irc.takeMsg()
         self.assertEqual(m, ircmsgs.IrcMsg(command='AUTHENTICATE',
@@ -1537,11 +1549,14 @@ def testExternalFallbackToPlain(self):
         conf.supybot.networks.test.sasl.username.setValue('jilles')
         conf.supybot.networks.test.sasl.password.setValue('sesame')
         conf.supybot.networks.test.certfile.setValue('foo')
+        conf.supybot.networks.test.sasl.mechanisms.setValue(
+            ['external', 'plain'])
 
         self.irc = irclib.Irc('test')
 
         self.assertEqual(self.irc.sasl_current_mechanism, None)
-        self.irc.sasl_next_mechanisms = ['external', 'plain']
+        self.assertEqual(self.irc.sasl_next_mechanisms,
+            ['external', 'plain'])
 
         self.startCapNegociation()
 
@@ -1570,11 +1585,14 @@ def testFilter(self):
         conf.supybot.networks.test.sasl.username.setValue('jilles')
         conf.supybot.networks.test.sasl.password.setValue('sesame')
         conf.supybot.networks.test.certfile.setValue('foo')
+        conf.supybot.networks.test.sasl.mechanisms.setValue(
+            ['external', 'plain'])
 
         self.irc = irclib.Irc('test')
 
         self.assertEqual(self.irc.sasl_current_mechanism, None)
-        self.irc.sasl_next_mechanisms = ['external', 'plain']
+        self.assertEqual(self.irc.sasl_next_mechanisms,
+            ['external', 'plain'])
 
         self.startCapNegociation(caps='sasl=foo,plain,bar')
 
@@ -1596,11 +1614,14 @@ def testFilter(self):
     def testReauthenticate(self):
         conf.supybot.networks.test.sasl.username.setValue('jilles')
         conf.supybot.networks.test.sasl.password.setValue('sesame')
+        conf.supybot.networks.test.sasl.mechanisms.setValue(
+            ['external', 'plain'])
 
         self.irc = irclib.Irc('test')
 
         self.assertEqual(self.irc.sasl_current_mechanism, None)
-        self.irc.sasl_next_mechanisms = ['plain']
+        self.assertEqual(self.irc.sasl_next_mechanisms,
+            ['plain'])
 
         self.startCapNegociation(caps='')