From d2ce30afdd22291eeeaea7f3566bb7bd6bb14dda Mon Sep 17 00:00:00 2001 From: "F. Jason Park" Date: Sat, 25 Nov 2023 14:26:24 -0800 Subject: [PATCH] ; Mark test for erc--update-channel-modes as :unstable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * test/lisp/erc/erc-scenarios-auth-source.el (erc-scenarios-common--auth-source): Extend timeout. * test/lisp/erc/erc-scenarios-base-buffer-display.el (erc-scenarios-base-buffer-display--count-reset-timeout): Await initial condition. * test/lisp/erc/erc-scenarios-base-renick.el (erc-scenarios-base-renick-queries-solo): Extend timeout. * test/lisp/erc/erc-scenarios-misc.el (erc-scenarios-base-flood): Extend timeout. * test/lisp/erc/erc-tests.el (erc--channel-modes): Mark test as :unstable pending further investigation. This test has been shown to be unreliable, possibly because it expects Emacs to report characters being a certain width in all environments. Thanks to Mattias Engdegård for reporting this failure. * test/lisp/erc/resources/base/reuse-buffers/server/barnet.eld: Extend timeouts. * test/lisp/erc/resources/base/reuse-buffers/server/foonet.eld: Extend timeouts. --- test/lisp/erc/erc-scenarios-auth-source.el | 2 +- test/lisp/erc/erc-scenarios-base-buffer-display.el | 2 +- test/lisp/erc/erc-scenarios-base-renick.el | 2 +- test/lisp/erc/erc-scenarios-misc.el | 2 +- test/lisp/erc/erc-tests.el | 2 ++ .../lisp/erc/resources/base/reuse-buffers/server/barnet.eld | 6 +++--- .../lisp/erc/resources/base/reuse-buffers/server/foonet.eld | 6 +++--- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/test/lisp/erc/erc-scenarios-auth-source.el b/test/lisp/erc/erc-scenarios-auth-source.el index 641b881666e..7eaf90e1e41 100644 --- a/test/lisp/erc/erc-scenarios-auth-source.el +++ b/test/lisp/erc/erc-scenarios-auth-source.el @@ -56,7 +56,7 @@ (should (string= (buffer-name) (if id (symbol-name id) (format "127.0.0.1:%d" port)))) - (erc-d-t-wait-for 5 (eq erc-network 'FooNet)))))) + (erc-d-t-wait-for 10 (eq erc-network 'FooNet)))))) (ert-deftest erc-scenarios-base-auth-source-server--dialed () :tags '(:expensive-test) diff --git a/test/lisp/erc/erc-scenarios-base-buffer-display.el b/test/lisp/erc/erc-scenarios-base-buffer-display.el index 6a80baeaaa9..889f274b8b1 100644 --- a/test/lisp/erc/erc-scenarios-base-buffer-display.el +++ b/test/lisp/erc/erc-scenarios-base-buffer-display.el @@ -193,7 +193,7 @@ (lambda (_) (with-current-buffer "FooNet" - (should erc--server-reconnect-display-timer)) + (erc-d-t-wait-for 1 erc--server-reconnect-display-timer)) ;; A non-interactive JOIN command doesn't signal that we're ;; done auto-reconnecting. diff --git a/test/lisp/erc/erc-scenarios-base-renick.el b/test/lisp/erc/erc-scenarios-base-renick.el index 2bf3ef46257..5a87e5871f7 100644 --- a/test/lisp/erc/erc-scenarios-base-renick.el +++ b/test/lisp/erc/erc-scenarios-base-renick.el @@ -173,7 +173,7 @@ (with-current-buffer erc-server-buffer-foo (should (string= (buffer-name) (format "127.0.0.1:%d" port))))) - (erc-d-t-wait-for 1 (get-buffer "foonet")) + (erc-d-t-wait-for 10 (get-buffer "foonet")) (ert-info ("Joined by bouncer to #foo, pal persent") (with-current-buffer (erc-d-t-wait-for 1 (get-buffer "#foo")) diff --git a/test/lisp/erc/erc-scenarios-misc.el b/test/lisp/erc/erc-scenarios-misc.el index bb925eed836..2efcd7ec7fb 100644 --- a/test/lisp/erc/erc-scenarios-misc.el +++ b/test/lisp/erc/erc-scenarios-misc.el @@ -75,7 +75,7 @@ (ert-info ("All output sent") (with-current-buffer "#chan/foonet" - (funcall expect 8 "Some man or other")) + (funcall expect 16 "Some man or other")) (with-current-buffer "#chan/barnet" (funcall expect 10 "That's he that was Othello"))))) diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 980928aceac..1d0eb70578a 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -812,6 +812,8 @@ (should-not calls)))) (ert-deftest erc--channel-modes () + :tags (and (null (getenv "CI")) '(:unstable)) + (setq erc--isupport-params (make-hash-table) erc--target (erc--target-from-string "#test") erc-server-parameters diff --git a/test/lisp/erc/resources/base/reuse-buffers/server/barnet.eld b/test/lisp/erc/resources/base/reuse-buffers/server/barnet.eld index cc7aff10076..5b64a58c98f 100644 --- a/test/lisp/erc/resources/base/reuse-buffers/server/barnet.eld +++ b/test/lisp/erc/resources/base/reuse-buffers/server/barnet.eld @@ -1,7 +1,7 @@ ;; -*- mode: lisp-data; -*- -((pass 1 "PASS :barnet:changeme")) -((nick 1 "NICK tester")) -((user 2 "USER user 0 * :tester") +((pass 10 "PASS :barnet:changeme")) +((nick 10 "NICK tester")) +((user 10 "USER user 0 * :tester") (0 ":irc.barnet.org 001 tester :Welcome to the barnet IRC Network tester") (0 ":irc.barnet.org 002 tester :Your host is irc.barnet.org, running version oragono-2.6.0-7481bf0385b95b16") (0 ":irc.barnet.org 003 tester :This server was created Sun, 25 Apr 2021 11:28:28 UTC") diff --git a/test/lisp/erc/resources/base/reuse-buffers/server/foonet.eld b/test/lisp/erc/resources/base/reuse-buffers/server/foonet.eld index 3a846108466..260ff74c20c 100644 --- a/test/lisp/erc/resources/base/reuse-buffers/server/foonet.eld +++ b/test/lisp/erc/resources/base/reuse-buffers/server/foonet.eld @@ -1,7 +1,7 @@ ;; -*- mode: lisp-data; -*- -((pass 1 "PASS :foonet:changeme")) -((nick 1 "NICK tester")) -((user 1 "USER user 0 * :tester") +((pass 10 "PASS :foonet:changeme")) +((nick 10 "NICK tester")) +((user 10 "USER user 0 * :tester") (0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester") (0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16") (0 ":irc.foonet.org 003 tester :This server was created Sun, 25 Apr 2021 11:28:28 UTC") -- 2.39.5