1 files changed, 46 insertions, 0 deletions
diff --git a/test/lisp/erc/erc-scenarios-base-upstream-recon-znc.el b/test/lisp/erc/erc-scenarios-base-upstream-recon-znc.el
index bbd9c79f593..f3905974a11 100644
--- a/test/lisp/erc/erc-scenarios-base-upstream-recon-znc.el
+++ b/test/lisp/erc/erc-scenarios-base-upstream-recon-znc.el
@@ -42,4 +42,50 @@
    'znc-foonet
    'znc-barnet))
 
+;; Here, the upstream connection is already severed when first
+;; connecting.  The bouncer therefore sends query messages from an
+;; administrative bot before the first numerics burst, which results
+;; in a target buffer not being associated with an `erc-networks--id'.
+;; The problem only manifests later, when the buffer-association
+;; machinery checks the names of all target buffers and assumes a
+;; non-nil `erc-networks--id'.
+(ert-deftest erc-scenarios-upstream-recon--znc/severed ()
+  (erc-scenarios-common-with-cleanup
+      ((erc-scenarios-common-dialog "base/upstream-reconnect")
+       (erc-d-t-cleanup-sleep-secs 1)
+       (erc-server-flood-penalty 0.1)
+       (dumb-server (erc-d-run "localhost" t 'znc-severed))
+       (port (process-contact dumb-server :service))
+       (expect (erc-d-t-make-expecter)))
+
+    (ert-info ("Connect to foonet")
+      (with-current-buffer (erc :server "127.0.0.1"
+                                :port port
+                                :nick "tester"
+                                :user "tester@vanilla/foonet"
+                                :password "changeme"
+                                :full-name "tester")
+        (erc-scenarios-common-assert-initial-buf-name nil port)
+        (erc-d-t-wait-for 6 (eq (erc-network) 'foonet))))
+
+    (with-current-buffer (erc-d-t-wait-for 5 (get-buffer "*status"))
+      (funcall expect 10 "Connection Refused.  Reconnecting...")
+      (funcall expect 10 "Connected!"))
+
+    (ert-info ("Join #chan")
+      (with-current-buffer (erc-d-t-wait-for 10 (get-buffer "#chan"))
+        (funcall expect 10 "<alice> tester, welcome!")
+        (funcall expect 10 "<bob> alice: And see a fearful sight")
+        (funcall expect 10 "<eve> hola")
+        (funcall expect 10 "<Evel> hell o")
+        ;;
+        (funcall expect 10 "<alice> bob: Or to drown my clothes")))
+
+    (ert-info ("Buffer not renamed with net id")
+      (should (get-buffer "*status")))
+
+    (ert-info ("No error")
+      (with-current-buffer (messages-buffer)
+        (funcall expect -0.1 "error in process filter")))))
+
 ;;; erc-scenarios-base-upstream-recon-znc.el ends here