1 files changed, 11 insertions, 5 deletions

diff --git a/test/lisp/erc/erc-scenarios-base-local-modules.el b/test/lisp/erc/erc-scenarios-base-local-modules.el
index 71923cc11f2..1d670b8f508 100644
--- a/test/lisp/erc/erc-scenarios-base-local-modules.el
+++ b/test/lisp/erc/erc-scenarios-base-local-modules.el
@@ -117,20 +117,25 @@
         (erc-cmd-QUIT "")
         (funcall expect 10 "finished")))
 
-    (ert-info ("Disabling works from a target buffer")
+    (ert-info ("Explicit disabling affects entire session")
+      ;; Even though the mode variable is nil (but locally bound) in
+      ;; this target buffer, disabling interactively with
+      ;; `erc-sasl-disable', deactivates the module session-wide.
       (with-current-buffer "#chan"
-        (should erc-sasl-mode)
-        (call-interactively #'erc-sasl-disable)
         (should-not erc-sasl-mode)
         (should (local-variable-p 'erc-sasl-mode))
+        (should (buffer-local-value 'erc-sasl-mode (get-buffer "foonet")))
+        (call-interactively #'erc-sasl-disable)
         (should-not (buffer-local-value 'erc-sasl-mode (get-buffer "foonet")))
+        (should-not erc-sasl-mode)
         (erc-cmd-RECONNECT)
         (funcall expect 10 "Some enigma, some riddle")
-        (should-not erc-sasl-mode) ; regression
+        (should-not erc-sasl-mode)
         (should (local-variable-p 'erc-sasl-mode)))
 
       (with-current-buffer "foonet"
         (should (local-variable-p 'erc-sasl-mode))
+        (should-not erc-sasl-mode)
         (funcall expect 10 "User modes for tester`")
         (erc-cmd-QUIT "")
         (funcall expect 10 "finished")))
@@ -139,7 +144,8 @@
       (with-current-buffer "#chan"
         (call-interactively #'erc-sasl-enable)
         (should (local-variable-p 'erc-sasl-mode))
-        (should erc-sasl-mode)
+        (should-not erc-sasl-mode)
+        (should (buffer-local-value 'erc-sasl-mode (get-buffer "foonet")))
         (erc-cmd-RECONNECT)
         (funcall expect 10 "Well met; good morrow, Titus and Hortensius.")
         (erc-cmd-QUIT ""))