fix/bug-48598 b125039c03 2/2: [FIXUP] Add user oriented test scenarios for ERC

[F. Jason Park]

branch: fix/bug-48598
commit b125039c038c0fed3e7b9b0b5b978efa3799be1d
Author: F. Jason Park <jp@neverwas.me>
Commit: F. Jason Park <jp@neverwas.me>

    [FIXUP] Add user oriented test scenarios for ERC
---
 test/lisp/erc/erc-scenarios-common.el | 1 +
 test/lisp/erc/erc-scenarios.el        | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/lisp/erc/erc-scenarios-common.el 
b/test/lisp/erc/erc-scenarios-common.el
index c2ae296e7f..9d81c0ee74 100644
--- a/test/lisp/erc/erc-scenarios-common.el
+++ b/test/lisp/erc/erc-scenarios-common.el
@@ -71,6 +71,7 @@
                        (quit . ,(erc-quit/part-reason-default))
                        (erc-version . ,erc-version)))
     (erc-modules (copy-sequence erc-modules))
+    (inhibit-interaction t)
     (auth-source-do-cache nil)
     (erc-autojoin-channels-alist nil)
     (erc-server-auto-reconnect nil)
diff --git a/test/lisp/erc/erc-scenarios.el b/test/lisp/erc/erc-scenarios.el
index 8f311a06bc..d206e4835c 100644
--- a/test/lisp/erc/erc-scenarios.el
+++ b/test/lisp/erc/erc-scenarios.el
@@ -72,7 +72,8 @@
 
 (require 'erc-d)
 (require 'erc-scenarios-common)
-(require 'erc-backend)
+(require 'erc)
+(eval-when-compile (require 'erc-services))
 
 (declare-function erc-network-name "erc-networks")
 (declare-function erc-network "erc-networks")
@@ -2141,8 +2142,6 @@ Adapted from scenario clash-of-chans/uniquify described 
in Bug#48598:
 
 (ert-deftest erc-scenarios-services-password ()
 
-  (defvar erc-nickserv-passwords) ; <- FIXME what is this?
-
   (erc-scenarios-common-with-cleanup
       ((erc-scenarios-common-dialog "services/password")
        (erc-server-flood-penalty 0.1)
@@ -2173,6 +2172,7 @@ Adapted from scenario clash-of-chans/uniquify described 
in Bug#48598:
   (erc-scenarios-common-with-cleanup
       ((erc-scenarios-common-dialog "services/password")
        (erc-server-flood-penalty 0.1)
+       (inhibit-interaction nil)
        (erc-modules (cons 'services erc-modules))
        (expect (erc-d-t-make-expecter))
        (dumb-server (erc-d-run "localhost" t 'libera))