From fedf45ca6337788717b2e7490fc4ef7b85195b61 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 4 Mar 2026 19:24:52 +0100 Subject: [PATCH] Revert "Repair serious breakage in the batch tests." This reverts commit feac53141577161c32a7a6dfe75399a5ae98a7c1. This patch has deactivated 253 test cases without a sufficient reasoning. Instead it speaks about a shotgun in its commite message. The patch is reverted because - It hasn't been discussed on emacs-devel. It should have, because it is a serious change in our infrastructure (new official tag :nobatch). Any documentation of this change, for example in test/README, is missing. - The proper way to deactivate such tests would have been (skip-when noninteractive) Even better to skip for the respective reasons. - There is no fault report. There is no information about how these tests have failed. Since it hasn't been a problem so far for us, nobody will work on a fix forever. --- test/Makefile.in | 28 +------ test/lisp/emacs-lisp/package-tests.el | 9 +-- test/lisp/epg-tests.el | 10 --- test/lisp/erc/erc-scenarios-auth-source.el | 30 +++----- .../erc-scenarios-base-association-nick.el | 6 +- .../erc-scenarios-base-association-query.el | 6 +- .../erc-scenarios-base-association-samenet.el | 6 +- .../erc/erc-scenarios-base-association.el | 12 +-- test/lisp/erc/erc-scenarios-base-attach.el | 9 +-- .../lisp/erc/erc-scenarios-base-auto-recon.el | 6 +- .../erc/erc-scenarios-base-buffer-display.el | 12 +-- .../lisp/erc/erc-scenarios-base-chan-modes.el | 6 +- ...rc-scenarios-base-compat-rename-bouncer.el | 6 +- .../erc/erc-scenarios-base-kill-on-part.el | 6 +- .../erc-scenarios-base-local-module-modes.el | 6 +- .../erc/erc-scenarios-base-local-modules.el | 9 +-- .../erc-scenarios-base-misc-regressions.el | 6 +- .../erc-scenarios-base-netid-bouncer-id.el | 6 +- ...scenarios-base-netid-bouncer-recon-base.el | 3 +- ...scenarios-base-netid-bouncer-recon-both.el | 3 +- ...c-scenarios-base-netid-bouncer-recon-id.el | 6 +- .../erc/erc-scenarios-base-netid-bouncer.el | 6 +- .../erc/erc-scenarios-base-netid-samenet.el | 12 +-- .../erc-scenarios-base-query-participants.el | 6 +- test/lisp/erc/erc-scenarios-base-reconnect.el | 9 +-- test/lisp/erc/erc-scenarios-base-renick.el | 21 ++---- .../erc/erc-scenarios-base-reuse-buffers.el | 6 +- .../erc/erc-scenarios-base-send-message.el | 6 +- .../lisp/erc/erc-scenarios-base-split-line.el | 9 +-- test/lisp/erc/erc-scenarios-base-statusmsg.el | 2 - test/lisp/erc/erc-scenarios-base-unstable.el | 6 +- .../erc-scenarios-base-upstream-recon-soju.el | 3 +- .../erc-scenarios-base-upstream-recon-znc.el | 5 +- .../lisp/erc/erc-scenarios-display-message.el | 3 +- test/lisp/erc/erc-scenarios-fill-wrap.el | 3 +- test/lisp/erc/erc-scenarios-ignore.el | 3 +- .../erc/erc-scenarios-join-auth-source.el | 3 +- .../erc/erc-scenarios-join-display-context.el | 3 +- .../erc/erc-scenarios-join-netid-newcmd-id.el | 6 +- .../erc/erc-scenarios-join-netid-newcmd.el | 3 +- .../erc/erc-scenarios-join-netid-recon-id.el | 6 +- .../erc/erc-scenarios-join-netid-recon.el | 3 +- test/lisp/erc/erc-scenarios-join-timing.el | 6 +- ...rc-scenarios-keep-place-indicator-trunc.el | 4 +- .../erc/erc-scenarios-keep-place-indicator.el | 4 +- test/lisp/erc/erc-scenarios-log.el | 12 +-- test/lisp/erc/erc-scenarios-match.el | 29 ++----- test/lisp/erc/erc-scenarios-misc-commands.el | 11 +-- test/lisp/erc/erc-scenarios-misc.el | 18 ++--- test/lisp/erc/erc-scenarios-nicks-track.el | 12 +-- test/lisp/erc/erc-scenarios-prompt-format.el | 3 +- test/lisp/erc/erc-scenarios-sasl.el | 21 ++---- .../erc-scenarios-scrolltobottom-relaxed.el | 4 +- test/lisp/erc/erc-scenarios-scrolltobottom.el | 12 +-- test/lisp/erc/erc-scenarios-services-misc.el | 21 ++---- test/lisp/erc/erc-scenarios-stamp.el | 9 +-- test/lisp/erc/erc-scenarios-status-sidebar.el | 3 +- test/lisp/erc/erc-tests.el | 6 -- test/lisp/erc/resources/erc-d/erc-d-tests.el | 75 ++++++------------- test/lisp/eshell/esh-proc-tests.el | 8 -- test/lisp/gnus/mml-sec-tests.el | 20 +---- test/lisp/jsonrpc-tests.el | 22 +----- test/lisp/net/eudc-tests.el | 2 - test/lisp/net/network-stream-tests.el | 20 ----- test/lisp/net/nsm-tests.el | 2 - test/lisp/net/socks-tests.el | 14 ---- test/lisp/net/tramp-tests.el | 14 +--- test/lisp/progmodes/python-tests.el | 24 ------ test/lisp/server-tests.el | 14 ---- test/lisp/tab-bar-tests.el | 2 - test/lisp/vc/vc-tests/vc-tests.el | 2 - test/lisp/wdired-tests.el | 2 - test/src/process-tests.el | 16 ---- 73 files changed, 175 insertions(+), 552 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index 7987ff40604..21f31f4c2d0 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -128,20 +128,6 @@ test_module_dir := src/emacs-module-resources all: check -# FIXME: The :nobatch tag is a principled but ugly emergency fix. -# -# There were a bunch of tests that were breaking make check and should -# never be run in batch mode, because they do things like assuming there -# is a controlling tty or assuming we can access network services when -# we can't (e/g. in a CI/CD environment). I have shotgunned this -# problem by tagging all the failing tests with :nobatch and then -# changing the default and expensive selectors so make check won't barf -# all over its shoes. -# -# As many of these should be individually removed as possible, after -# upgrading the test harness to mock the environmental stuff they need. -# Investigate these failures with "make check-nobatch". - SYSTEM_TYPE = @SYSTEM_TYPE@ TEST_NATIVE_COMP = $(HAVE_NATIVE_COMP) # Avoid fork failures on Cygwin. See bug#62450 and etc/PROBLEMS @@ -150,18 +136,17 @@ ifeq ($(SYSTEM_TYPE),cygwin) TEST_NATIVE_COMP = no endif ifeq ($(TEST_NATIVE_COMP),yes) -SELECTOR_DEFAULT = (not (or (tag :expensive-test) (tag :unstable) (tag :nobatch))) -SELECTOR_EXPENSIVE = (not (or (tag :unstable) (tag :nobatch))) +SELECTOR_DEFAULT = (not (or (tag :expensive-test) (tag :unstable))) +SELECTOR_EXPENSIVE = (not (tag :unstable)) SELECTOR_ALL = t else -SELECTOR_DEFAULT = (not (or (tag :expensive-test) (tag :unstable) (tag :nativecomp) (tag :nobatch))) -SELECTOR_EXPENSIVE = (not (or (tag :unstable) (tag :nativecomp) (tag :nobatch))) +SELECTOR_DEFAULT = (not (or (tag :expensive-test) (tag :unstable) (tag :nativecomp))) +SELECTOR_EXPENSIVE = (not (or (tag :unstable) (tag :nativecomp))) SELECTOR_ALL = (not (tag :nativecomp)) endif ifdef SELECTOR SELECTOR_ACTUAL=$(SELECTOR) else ifndef MAKECMDGOALS - SELECTOR_ACTUAL=$(SELECTOR_DEFAULT) else ifeq ($(MAKECMDGOALS),all) SELECTOR_ACTUAL=$(SELECTOR_DEFAULT) @@ -351,11 +336,6 @@ check-expensive: mostlyclean check-no-automated-subdir check-all: mostlyclean check-no-automated-subdir @${MAKE} check-doit SELECTOR="${SELECTOR_ALL}" -# Investigate the :nobatch failures -.PHONY: check-nobatch -check-nobatch: mostlyclean check-no-automated-subdir - @${MAKE} check-doit SELECTOR="(tag :nobatch)" - ## Re-run all tests which are outdated. A test is outdated if its ## logfile is out-of-date with either the test file, or the source ## files that the tests depend on. See test_template. diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el index f3c14ed1f2b..a8c34e8e45b 100644 --- a/test/lisp/emacs-lisp/package-tests.el +++ b/test/lisp/emacs-lisp/package-tests.el @@ -522,8 +522,7 @@ but with a different end of line convention (bug#48137)." (goto-char (point-min)) (should (re-search-forward re nil t))))))) - - + ;;; Package Menu tests (defmacro with-package-menu-test (&rest body) @@ -661,10 +660,9 @@ but with a different end of line convention (bug#48137)." (revert-buffer) (should (package-installed-p 'simple-single '(1 4))))))) -;; Fails in batch: signal (ert-deftest package-test-update-archives-async () "Test updating package archives asynchronously." - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* ((package-menu-async t) (default-directory package-test-data-dir) (python-interpreter (seq-some #'executable-find '("python" "python3" "python2"))) @@ -895,8 +893,7 @@ but with a different end of line convention (bug#48137)." nil t)))))) - - + ;;; Tests for package-x features. (with-suppressed-warnings ((obsolete package-x)) diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el index f09f55eee01..d6e89f34f18 100644 --- a/test/lisp/epg-tests.el +++ b/test/lisp/epg-tests.el @@ -98,10 +98,8 @@ (setq-local epg-tests-context context) ,@body))))) -;; Fails in batch: signal (ert-deftest epg-decrypt-1 () :expected-result (if (getenv "EMACS_HYDRA_CI") :failed :passed) ; fixme - :tags '(:nobatch) (with-epg-tests (:require-passphrase t) (should (equal "test" (epg-decrypt-string epg-tests-context "\ @@ -139,9 +137,7 @@ jA0ECQMCdW8+qtS9Tin/0jUBO1/9Oz69BWPmtFKEeBM62WpFP4o1+bNzdxogdyeg (should (equal "public key" (epg-decrypt-string epg-tests-context cipher)))))) -;; Fails in batch: signal (ert-deftest epg-sign-verify-1 () - :tags '(:nobatch) (with-epg-tests (:require-passphrase t :require-public-key t :require-secret-key t) @@ -154,9 +150,7 @@ jA0ECQMCdW8+qtS9Tin/0jUBO1/9Oz69BWPmtFKEeBM62WpFP4o1+bNzdxogdyeg (should (= 1 (length verify-result))) (should (eq 'good (epg-signature-status (car verify-result))))))) -;; Fails in batch: signal (ert-deftest epg-sign-verify-2 () - :tags '(:nobatch) (with-epg-tests (:require-passphrase t :require-public-key t :require-secret-key t) @@ -171,9 +165,7 @@ jA0ECQMCdW8+qtS9Tin/0jUBO1/9Oz69BWPmtFKEeBM62WpFP4o1+bNzdxogdyeg (should (= 1 (length verify-result))) (should (eq 'good (epg-signature-status (car verify-result))))))) -;; Fails in batch: signal (ert-deftest epg-sign-verify-3 () - :tags '(:nobatch) (with-epg-tests (:require-passphrase t :require-public-key t :require-secret-key t) @@ -187,9 +179,7 @@ jA0ECQMCdW8+qtS9Tin/0jUBO1/9Oz69BWPmtFKEeBM62WpFP4o1+bNzdxogdyeg (should (= 1 (length verify-result))) (should (eq 'good (epg-signature-status (car verify-result))))))) -;; Fails in batch: signal (ert-deftest epg-import-1 () - :tags '(:nobatch) (with-epg-tests (:require-passphrase nil) (should (= 0 (length (epg-list-keys epg-tests-context)))) (should (= 0 (length (epg-list-keys epg-tests-context nil t))))) diff --git a/test/lisp/erc/erc-scenarios-auth-source.el b/test/lisp/erc/erc-scenarios-auth-source.el index f1b31f08b04..be651ee9c45 100644 --- a/test/lisp/erc/erc-scenarios-auth-source.el +++ b/test/lisp/erc/erc-scenarios-auth-source.el @@ -62,9 +62,8 @@ (format "127.0.0.1:%d" port)))) (erc-d-t-wait-for 10 (eq erc-network 'FooNet)))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-auth-source-server--dialed () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-port 'test)) (erc-scenarios-common--auth-source nil 'foonet @@ -73,18 +72,16 @@ "machine 127.0.0.1 port \"%s\" user tester password changeme" ; correct "machine 127.0.0.1 port %d user imposter password fake"))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-auth-source-server--netid () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--auth-source 'MySession 'foonet "machine MySession port %d user tester password changeme" "machine 127.0.0.1 port %d user tester password fake" "machine FooNet port %d user tester password fake")) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-auth-source-server--netid-custom () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-auth-source-server-function (lambda (&rest _) (erc-auth-source-search :host "MyHost")))) (erc-scenarios-common--auth-source @@ -93,15 +90,13 @@ "machine MyHost port %d user tester password changeme" "machine MySession port %d user tester password fake"))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-auth-source-server--nopass () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let (erc-auth-source-server-function) (erc-scenarios-common--auth-source nil 'nopass))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-auth-source-server--nopass-netid () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let (erc-auth-source-server-function) (erc-scenarios-common--auth-source 'MySession 'nopass))) @@ -145,9 +140,8 @@ ;; These tests are about authenticating to nick services -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-auth-source--network () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) ;; Skip consulting auth-source for the server password (PASS). (let (erc-auth-source-server-function) (erc-scenarios-common--services-auth-source @@ -155,34 +149,30 @@ "machine zirconium.libera.chat port %d user tester password fake" "machine Libera.Chat port %d user tester password changeme"))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-auth-source--network-connect-lookup () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) ;; Do consult auth-source for the server password (and find nothing) (erc-scenarios-common--services-auth-source "machine zirconium.libera.chat port %d user tester password fake" "machine Libera.Chat port %d user tester password changeme")) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-auth-source--announced () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let (erc-auth-source-server-function) (erc-scenarios-common--services-auth-source "machine 127.0.0.1 port %d user tester password spam" "machine zirconium.libera.chat port %d user tester password changeme"))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-auth-source--dialed () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) ;; Support legacy host -> domain name ;; (likely most common in real configs) (let (erc-auth-source-server-function) (erc-scenarios-common--services-auth-source "machine 127.0.0.1 port %d user tester password changeme"))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-auth-source--custom () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let (erc-auth-source-server-function (erc-auth-source-services-function (lambda (&rest _) (erc-auth-source-search :host "MyAccount")))) diff --git a/test/lisp/erc/erc-scenarios-base-association-nick.el b/test/lisp/erc/erc-scenarios-base-association-nick.el index c869ad972e0..51b9894c1e9 100644 --- a/test/lisp/erc/erc-scenarios-base-association-nick.el +++ b/test/lisp/erc/erc-scenarios-base-association-nick.el @@ -45,9 +45,8 @@ ;; clearer example, see the original version of this file introduced ;; by "Add user-oriented test scenarios for ERC". -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-nick-bumped () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/bumped") (dumb-server (erc-d-run "localhost" t 'renicked 'again)) @@ -111,9 +110,8 @@ ;; nick while you're disconnected, and upon reconnecting, you get ;; a new nick. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-nick-bumped-mandated-renick () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/bumped") (dumb-server (erc-d-run "localhost" t 'foisted 'refoisted)) diff --git a/test/lisp/erc/erc-scenarios-base-association-query.el b/test/lisp/erc/erc-scenarios-base-association-query.el index f06d81e868e..2ae83a18457 100644 --- a/test/lisp/erc/erc-scenarios-base-association-query.el +++ b/test/lisp/erc/erc-scenarios-base-association-query.el @@ -32,9 +32,8 @@ ;; exist for these, so new ones are created that feature a net-ID ;; @suffix. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-existing-non-erc-buffer () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/queries") (dumb-server (erc-d-run "localhost" t 'non-erc)) @@ -75,9 +74,8 @@ ;; Someone sending you a PM has the same name as the network (bug#59976) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-some-nick-is-network () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/queries") (dumb-server (erc-d-run "localhost" t 'netnick)) diff --git a/test/lisp/erc/erc-scenarios-base-association-samenet.el b/test/lisp/erc/erc-scenarios-base-association-samenet.el index d51bdaef30b..822039d4a85 100644 --- a/test/lisp/erc/erc-scenarios-base-association-samenet.el +++ b/test/lisp/erc/erc-scenarios-base-association-samenet.el @@ -82,9 +82,8 @@ (funcall after expect))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-samenet--reconnect-one () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-association-samenet (lambda (expect) @@ -107,9 +106,8 @@ (funcall expect 5 "welcome again") (erc-cmd-QUIT ""))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-samenet--new-buffer () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-association-samenet (lambda (expect) diff --git a/test/lisp/erc/erc-scenarios-base-association.el b/test/lisp/erc/erc-scenarios-base-association.el index 08d5f86fa5f..bce51119323 100644 --- a/test/lisp/erc/erc-scenarios-base-association.el +++ b/test/lisp/erc/erc-scenarios-base-association.el @@ -86,9 +86,8 @@ (funcall expect 3 "was created on") (funcall expect 20 "ingenuous"))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-multi-net--baseline () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-association-multi-net (lambda () (with-current-buffer "barnet" (erc-cmd-JOIN "#chan"))))) @@ -97,9 +96,8 @@ ;; bug#47522) to show that issuing superfluous /join commands ;; (apparently fairly common) is benign. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-multi-net--ambiguous-join () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-association-multi-net (lambda () (ert-info ("Nonsensical JOIN attempts silently dropped.") @@ -119,9 +117,8 @@ ;; Originally from Bug#48598: 28.0.50; buffer-naming collisions ;; involving bouncers in ERC. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-bouncer-history () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/bouncer-history") (erc-d-t-cleanup-sleep-secs 1) @@ -203,9 +200,8 @@ ;; "Attempt to display deleted buffer" error when they try switching ;; to it. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-networks-merge-server-track () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "networks/merge-server") (dumb-server (erc-d-run "localhost" t 'track 'track)) diff --git a/test/lisp/erc/erc-scenarios-base-attach.el b/test/lisp/erc/erc-scenarios-base-attach.el index feb9b87e987..24957d7fd43 100644 --- a/test/lisp/erc/erc-scenarios-base-attach.el +++ b/test/lisp/erc/erc-scenarios-base-attach.el @@ -61,9 +61,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-attach--ensure-target-buffer--enabled () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should erc-ensure-target-buffer-on-privmsg) (erc-scenarios-common-with-cleanup @@ -104,9 +103,8 @@ (erc-scenarios-common-say "bob: hi") (funcall expect 10 "Pawn me to this"))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-attach--ensure-target-buffer--disabled () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should erc-ensure-target-buffer-on-privmsg) (erc-scenarios-common-with-cleanup @@ -151,9 +149,8 @@ ;; this option and already covered many times over by other tests in ;; this directory. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-attach--ensure-target-buffer--disabled-query () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should erc-ensure-target-buffer-on-privmsg) (erc-scenarios-common-with-cleanup diff --git a/test/lisp/erc/erc-scenarios-base-auto-recon.el b/test/lisp/erc/erc-scenarios-base-auto-recon.el index 2b55c58d8a1..4694f426dfd 100644 --- a/test/lisp/erc/erc-scenarios-base-auto-recon.el +++ b/test/lisp/erc/erc-scenarios-base-auto-recon.el @@ -39,9 +39,8 @@ ;; This demos one possible flavor of intermittent service. ;; It may end up needing to be marked :unstable. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-auto-recon-check/no-reuse () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-server-flood-penalty 0.1) (port (erc-scenarios-base-auto-recon--get-unused-port)) @@ -96,9 +95,8 @@ ;; Here, a listener accepts but doesn't respond to any messages. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-auto-recon-check/reuse () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should erc-server-delayed-check-reconnect-reuse-process-p) (erc-scenarios-common-with-cleanup ((erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-base-buffer-display.el b/test/lisp/erc/erc-scenarios-base-buffer-display.el index 8e0e1ede042..09c56e03fa2 100644 --- a/test/lisp/erc/erc-scenarios-base-buffer-display.el +++ b/test/lisp/erc/erc-scenarios-base-buffer-display.el @@ -89,9 +89,8 @@ ;; count, making ERC ignore the option `erc-auto-reconnect-display' ;; when next displaying a newly set up buffer. In the case of a ;; /JOIN, the option `erc-interactive-display' takes precedence. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-buffer-display--defwin-recbury-intbuf () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-buffer-display 'bury)) (should (eq erc-interactive-display 'window)) (should-not erc-auto-reconnect-display) @@ -131,9 +130,8 @@ ;; Emacs reuses the selected window (no split). (should (frame-root-window-p (selected-window))))))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-buffer-display--defwino-recbury-intbuf () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-buffer-display 'bury)) (should (eq erc-interactive-display 'window)) (should-not erc-auto-reconnect-display) @@ -180,9 +178,8 @@ (should-not (frame-root-window-p (selected-window))) ; noselect (should (eq (current-buffer) (window-buffer (next-window)))))))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-buffer-display--count-reset-timeout () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-buffer-display 'bury)) (should (eq erc-interactive-display 'window)) (should (eq erc-auto-reconnect-display-timeout 10)) @@ -217,9 +214,8 @@ ;; This shows that the option `erc-interactive-display' overrides ;; `erc-join-buffer' during cold opens and interactive /JOINs. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-buffer-display--interactive-default () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-join-buffer 'bury)) (should (eq erc-interactive-display 'window)) diff --git a/test/lisp/erc/erc-scenarios-base-chan-modes.el b/test/lisp/erc/erc-scenarios-base-chan-modes.el index 755ca1a35e8..21b6ca53853 100644 --- a/test/lisp/erc/erc-scenarios-base-chan-modes.el +++ b/test/lisp/erc/erc-scenarios-base-chan-modes.el @@ -29,9 +29,8 @@ ;; it were a status prefix update, which led to a wrong-type error. ;; This test does not address similar collisions with unary modes, ;; such as "MODE +q foo!*@*", but it should. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-chan-modes--plus-q () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/modes") (erc-server-flood-penalty 0.1) @@ -96,9 +95,8 @@ ;; correctness of our processing logic, but it's unclear how such a ;; discrepancy ought to be handled beyond asking the user to file a ;; bug. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-chan-modes--speaker-status () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/modes") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el index b6ac8f11a7a..4eb50b449f0 100644 --- a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el +++ b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el @@ -113,17 +113,15 @@ (when more (funcall more)))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-compat-no-rename-bouncer--basic () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (with-suppressed-warnings ((obsolete erc-rename-buffers)) (let (erc-rename-buffers) (erc-scenarios-common--base-compat-no-rename-bouncer '(foonet barnet) nil nil)))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-compat-no-rename-bouncer--reconnect () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-d-tmpl-vars '((token . (group (| "barnet" "foonet"))))) (erc-d-match-handlers (list :pass #'erc-scenarios-common--clash-rename-pass-handler)) diff --git a/test/lisp/erc/erc-scenarios-base-kill-on-part.el b/test/lisp/erc/erc-scenarios-base-kill-on-part.el index f6d0e23cd59..6472fee8c6c 100644 --- a/test/lisp/erc/erc-scenarios-base-kill-on-part.el +++ b/test/lisp/erc/erc-scenarios-base-kill-on-part.el @@ -28,9 +28,8 @@ ;; enabled and a user issues a /part. Also assert that code in ;; `erc-kill-channel-hook' can detect when `erc-response-PART' is ;; killing a buffer on behalf of that option. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-kill-on-part--enabled () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should-not erc-kill-buffer-on-part) (erc-scenarios-common-with-cleanup @@ -63,9 +62,8 @@ ;; When `erc-kill-buffer-on-part' is non-nil, and the parted buffer has ;; already been killed, don't kill the server buffer. Bug#70840 -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-kill-on-part--enabled/killed () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should-not erc-kill-buffer-on-part) (erc-scenarios-common-with-cleanup diff --git a/test/lisp/erc/erc-scenarios-base-local-module-modes.el b/test/lisp/erc/erc-scenarios-base-local-module-modes.el index 03dcbc42b3d..48498373faa 100644 --- a/test/lisp/erc/erc-scenarios-base-local-module-modes.el +++ b/test/lisp/erc/erc-scenarios-base-local-module-modes.el @@ -52,9 +52,8 @@ ;; that a server renicking a user on 001 after a 903 is handled just ;; like a user-initiated renick, although this is not the main thrust. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-local-module-modes--reconnect () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/local-modules") (erc-server-flood-penalty 0.1) @@ -146,9 +145,8 @@ ;; Whether a local-module's state variable is also reset in target ;; buffers up to the module. That is, by default, they're left alone. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-local-module-modes--entrypoint () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/local-modules") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-base-local-modules.el b/test/lisp/erc/erc-scenarios-base-local-modules.el index d6c1999241f..da247828614 100644 --- a/test/lisp/erc/erc-scenarios-base-local-modules.el +++ b/test/lisp/erc/erc-scenarios-base-local-modules.el @@ -44,9 +44,8 @@ ;; This asserts that a local module's options and its inclusion in ;; (and absence from) `erc-update-modules' can be let-bound. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-local-modules--reconnect-let () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "sasl") (erc-server-flood-penalty 0.1) @@ -87,9 +86,8 @@ ;; `erc-FOO-disable' affect all buffers of a connection, whereas ;; `erc-FOO-mode' continues to operate only on the current buffer. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-local-modules--toggle-helpers () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/local-modules") (erc-server-flood-penalty 0.1) @@ -177,9 +175,8 @@ ;; absence of QUITs. (That said, three connections in under 2 seconds ;; is pretty nice.) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-local-modules--var-persistence () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/reconnect") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-base-misc-regressions.el b/test/lisp/erc/erc-scenarios-base-misc-regressions.el index 8deb292ad78..a4ea1a3b0fd 100644 --- a/test/lisp/erc/erc-scenarios-base-misc-regressions.el +++ b/test/lisp/erc/erc-scenarios-base-misc-regressions.el @@ -33,12 +33,11 @@ (should (member match (list "foonet" "barnet"))) (erc-d-load-replacement-dialog dialog sym 1)))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-gapless-connect () "Back-to-back entry-point invocations happen successfully. Originally from scenario rebuffed/gapless as explained in Bug#48598: 28.0.50; buffer-naming collisions involving bouncers in ERC." - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/gapless-connect") (erc-server-flood-penalty 0.1) @@ -89,9 +88,8 @@ Originally from scenario rebuffed/gapless as explained in Bug#48598: ;; killed off and PRIVMSGs arrive targeting it, the buffer should be ;; recreated. See elsewhere for NOTICE logic, which is more complex. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-channel-buffer-revival () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/channel-buffer-revival") diff --git a/test/lisp/erc/erc-scenarios-base-netid-bouncer-id.el b/test/lisp/erc/erc-scenarios-base-netid-bouncer-id.el index 14b16328ae1..2fe0ec9dbdd 100644 --- a/test/lisp/erc/erc-scenarios-base-netid-bouncer-id.el +++ b/test/lisp/erc/erc-scenarios-base-netid-bouncer-id.el @@ -24,14 +24,12 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-netid-bouncer--id-foo () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-network-id-bouncer '(:foo-id t) 'foonet 'barnet)) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-netid-bouncer--id-bar () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-network-id-bouncer '(:bar-id t) 'foonet 'barnet)) ;;; erc-scenarios-base-netid-bouncer-id.el ends here diff --git a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el index eaa9795c5d2..dade4891081 100644 --- a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el +++ b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-base.el @@ -24,9 +24,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-netid-bouncer--recon-base () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-server-reconnect-function #'erc-server-delayed-reconnect)) (erc-scenarios-common--base-network-id-bouncer--reconnect nil nil))) diff --git a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el index 0511c5df638..fe24e3563c7 100644 --- a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el +++ b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-both.el @@ -25,9 +25,8 @@ (require 'erc-scenarios-common) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-netid-bouncer--recon-both () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-server-reconnect-function #'erc-server-delayed-reconnect)) (erc-scenarios-common--base-network-id-bouncer--reconnect 'foo-id 'bar-id))) diff --git a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el index 3aabc279c12..48822f0a8f5 100644 --- a/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el +++ b/test/lisp/erc/erc-scenarios-base-netid-bouncer-recon-id.el @@ -24,15 +24,13 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-netid-bouncer--reconnect-id-foo () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-server-reconnect-function #'erc-server-delayed-reconnect)) (erc-scenarios-common--base-network-id-bouncer--reconnect 'foo-id nil))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-netid-bouncer--reconnect-id-bar () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-server-reconnect-function #'erc-server-delayed-reconnect)) (erc-scenarios-common--base-network-id-bouncer--reconnect nil 'bar-id))) diff --git a/test/lisp/erc/erc-scenarios-base-netid-bouncer.el b/test/lisp/erc/erc-scenarios-base-netid-bouncer.el index c377bd853d3..b9703aa5e09 100644 --- a/test/lisp/erc/erc-scenarios-base-netid-bouncer.el +++ b/test/lisp/erc/erc-scenarios-base-netid-bouncer.el @@ -24,14 +24,12 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-netid-bouncer--base () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-network-id-bouncer () 'foonet 'barnet)) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-netid-bouncer--both () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-network-id-bouncer '(:foo-id t :bar-id t) 'foonet 'barnet)) diff --git a/test/lisp/erc/erc-scenarios-base-netid-samenet.el b/test/lisp/erc/erc-scenarios-base-netid-samenet.el index 5401866bf5b..22aa5f8457b 100644 --- a/test/lisp/erc/erc-scenarios-base-netid-samenet.el +++ b/test/lisp/erc/erc-scenarios-base-netid-samenet.el @@ -100,9 +100,8 @@ (funcall expect 5 "To employ you towards") (erc-cmd-QUIT "")))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-network-id-same-network--two-ids () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-network-id-same-network (list :nick "tester" :id 'tester/foonet @@ -113,9 +112,8 @@ :server "chester/foonet" :chan "#chan@chester/foonet"))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-network-id-same-network--one-id-tester () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-network-id-same-network (list :nick "tester" :id 'tester/foonet @@ -126,9 +124,8 @@ :server "foonet" :chan "#chan@foonet"))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-network-id-same-network--one-id-chester () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-network-id-same-network (list :nick "tester" :id nil @@ -139,9 +136,8 @@ :server "chester/foonet" :chan "#chan@chester/foonet"))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-network-id-same-network--no-ids () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--base-network-id-same-network (list :nick "tester" :id nil diff --git a/test/lisp/erc/erc-scenarios-base-query-participants.el b/test/lisp/erc/erc-scenarios-base-query-participants.el index 6a4e85fa0d9..4f95ca871a3 100644 --- a/test/lisp/erc/erc-scenarios-base-query-participants.el +++ b/test/lisp/erc/erc-scenarios-base-query-participants.el @@ -24,9 +24,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-query-participants/legacy () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/query-participants") @@ -115,9 +114,8 @@ (should-not (erc-get-server-user "bob")) ; missing from query (should (erc-get-server-user "dummy")))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-query-participants/coupled () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/query-participants") diff --git a/test/lisp/erc/erc-scenarios-base-reconnect.el b/test/lisp/erc/erc-scenarios-base-reconnect.el index 3121a86a589..1444555e59d 100644 --- a/test/lisp/erc/erc-scenarios-base-reconnect.el +++ b/test/lisp/erc/erc-scenarios-base-reconnect.el @@ -30,9 +30,8 @@ ;; (rather than infinitely many) times, which can easily happen when ;; tweaking code related to process sentinels in erc-backend.el. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-reconnect-timer () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/reconnect") (dumb-server (erc-d-run "localhost" t 'timer 'timer 'timer-last)) @@ -73,9 +72,8 @@ ;; overlaps with this and includes spurious JOINs ignored by the ;; server. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-association-reconnect-playback () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/reconplay") (erc-server-flood-penalty 0.1) @@ -140,9 +138,8 @@ (funcall expect 10 "here comes the lady"))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-cancel-reconnect () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/reconnect") (dumb-server (erc-d-run "localhost" t 'timer 'timer 'timer-last)) diff --git a/test/lisp/erc/erc-scenarios-base-renick.el b/test/lisp/erc/erc-scenarios-base-renick.el index d9910fd7636..ad2a83261d2 100644 --- a/test/lisp/erc/erc-scenarios-base-renick.el +++ b/test/lisp/erc/erc-scenarios-base-renick.el @@ -28,9 +28,8 @@ ;; The server changes your nick just after registration. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-renick-self-auto () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/renick/self") (erc-server-flood-penalty 0.1) @@ -59,9 +58,8 @@ ;; You change your nickname manually in a server buffer; a message is ;; printed in channel buffers. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-renick-self-manual () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/renick/self") (erc-server-flood-penalty 0.1) @@ -96,9 +94,8 @@ ;; manually change the first nick at some point, and buffer names are ;; updated correctly. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-renick-self-qualified () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/renick/self") (dumb-server (erc-d-run "localhost" t 'qual-tester 'qual-chester)) @@ -155,9 +152,8 @@ ;; When a channel user changes their nick, any query buffers for them ;; are updated. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-renick-queries-solo () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/renick/queries") @@ -234,9 +230,8 @@ ;; uniquifying suffix of the form bob<2> to the new, post-renick ;; query. ERC 5.6+ acts differently. It mimics popular standalone ;; clients in reusing existing query buffers. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-renick-queries/reassume () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/renick/queries") @@ -298,9 +293,8 @@ ;; The buffers for the two session should then be merged with the help ;; of `erc-networks--transplant-target-buffer-function' and ;; `erc-networks--copy-server-buffer-functions'. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-renick-self/merge-query () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/renick/self") @@ -392,9 +386,8 @@ ;; networks (through a proxy). The user changes their nick on both ;; networks at the same time. Query buffers are updated accordingly. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-renick-queries-bouncer () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/renick/queries") diff --git a/test/lisp/erc/erc-scenarios-base-reuse-buffers.el b/test/lisp/erc/erc-scenarios-base-reuse-buffers.el index ec9fe40e268..63c11bd1710 100644 --- a/test/lisp/erc/erc-scenarios-base-reuse-buffers.el +++ b/test/lisp/erc/erc-scenarios-base-reuse-buffers.el @@ -64,9 +64,8 @@ collisions involving bouncers in ERC. Run EXTRA." (when more (funcall more port)))) ;; FIXME no sense in running this twice (JOIN variant includes this) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-reuse-buffers-server-buffers--disabled () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (with-suppressed-warnings ((obsolete erc-reuse-buffers)) (should erc-reuse-buffers) (let ((erc-scenarios-common-dialog "base/reuse-buffers/server") @@ -188,9 +187,8 @@ Adapted from scenario clash-of-chans/uniquify described in Bug#48598: (should-not (get-buffer "#chan")) (should (get-buffer "#chan/127.0.0.1"))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-reuse-buffers-channel-buffers--disabled () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (with-suppressed-warnings ((obsolete erc-reuse-buffers)) (should erc-reuse-buffers) (let ((erc-scenarios-common-dialog "base/reuse-buffers/channel") diff --git a/test/lisp/erc/erc-scenarios-base-send-message.el b/test/lisp/erc/erc-scenarios-base-send-message.el index 05a55c48412..7364b573dfa 100644 --- a/test/lisp/erc/erc-scenarios-base-send-message.el +++ b/test/lisp/erc/erc-scenarios-base-send-message.el @@ -27,9 +27,8 @@ ;; So-called "noncommands" are those that massage input submitted at ;; the prompt and send it on behalf of the user. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-send-message--noncommands () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/send-message") (erc-server-flood-penalty 0.1) @@ -73,9 +72,8 @@ ;; This asserts that the `command-indicator' module only inserts ;; prompt-like prefixes for normal slash commands, like /JOIN. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-send-message--command-indicator () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/send-message") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-base-split-line.el b/test/lisp/erc/erc-scenarios-base-split-line.el index 31a2fe7eb21..4f1ff06ec42 100644 --- a/test/lisp/erc/erc-scenarios-base-split-line.el +++ b/test/lisp/erc/erc-scenarios-base-split-line.el @@ -24,9 +24,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-split-line--koi8-r () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (equal erc-split-line-length 440)) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/flood") @@ -74,9 +73,8 @@ (erc-cmd-QUIT "") (funcall expect 10 "finished")))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-split-line--ascii () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (equal erc-split-line-length 440)) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/flood") @@ -134,9 +132,8 @@ (erc-cmd-QUIT "") (funcall expect 10 "finished")))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-split-line--utf-8 () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (unless (> emacs-major-version 27) (ert-skip "No emojis in Emacs 27")) diff --git a/test/lisp/erc/erc-scenarios-base-statusmsg.el b/test/lisp/erc/erc-scenarios-base-statusmsg.el index 1e87e11660f..4cd55f12a21 100644 --- a/test/lisp/erc/erc-scenarios-base-statusmsg.el +++ b/test/lisp/erc/erc-scenarios-base-statusmsg.el @@ -24,9 +24,7 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-statusmsg () - :tags '(:nobatch) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/display-message") diff --git a/test/lisp/erc/erc-scenarios-base-unstable.el b/test/lisp/erc/erc-scenarios-base-unstable.el index 6ca285af903..5f6ec471932 100644 --- a/test/lisp/erc/erc-scenarios-base-unstable.el +++ b/test/lisp/erc/erc-scenarios-base-unstable.el @@ -28,9 +28,8 @@ ;; Not unstable, but stashed here for now -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-aux-unix-socket () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (skip-unless (featurep 'make-network-process '(:family local))) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/renick/self") @@ -143,9 +142,8 @@ ;; override various erc-server-*-functions to avoid operating in a ;; degraded state, which has likely been the case for a while. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-networks-no-module () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "networks/no-module") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-base-upstream-recon-soju.el b/test/lisp/erc/erc-scenarios-base-upstream-recon-soju.el index d9edec89d6c..8946465508d 100644 --- a/test/lisp/erc/erc-scenarios-base-upstream-recon-soju.el +++ b/test/lisp/erc/erc-scenarios-base-upstream-recon-soju.el @@ -29,9 +29,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-upstream-recon--soju () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--upstream-reconnect (lambda () (with-current-buffer "foonet" 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 187dd448d92..0aa08d03375 100644 --- a/test/lisp/erc/erc-scenarios-base-upstream-recon-znc.el +++ b/test/lisp/erc/erc-scenarios-base-upstream-recon-znc.el @@ -29,9 +29,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-upstream-recon--znc () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common--upstream-reconnect (lambda () (with-current-buffer "*status@foonet" @@ -50,9 +49,7 @@ ;; 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'. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-upstream-recon--znc/severed () - :tags '(:nobatch) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/upstream-reconnect") (erc-d-t-cleanup-sleep-secs 1) diff --git a/test/lisp/erc/erc-scenarios-display-message.el b/test/lisp/erc/erc-scenarios-display-message.el index b028792a1c2..735368ce400 100644 --- a/test/lisp/erc/erc-scenarios-display-message.el +++ b/test/lisp/erc/erc-scenarios-display-message.el @@ -24,9 +24,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-display-message--multibuf () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/display-message") (dumb-server (erc-d-run "localhost" t 'multibuf)) diff --git a/test/lisp/erc/erc-scenarios-fill-wrap.el b/test/lisp/erc/erc-scenarios-fill-wrap.el index 0a8718b8e18..89f6eaf7988 100644 --- a/test/lisp/erc/erc-scenarios-fill-wrap.el +++ b/test/lisp/erc/erc-scenarios-fill-wrap.el @@ -30,9 +30,8 @@ ;; This asserts that an intervening date stamp between two messages ;; from the same speaker will trigger a break in merge detection, so ;; the second message's speaker tag won't be hidden. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-fill-wrap/merge-datestamp () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "fill/wrap") diff --git a/test/lisp/erc/erc-scenarios-ignore.el b/test/lisp/erc/erc-scenarios-ignore.el index f3c57d62676..f22505bd15d 100644 --- a/test/lisp/erc/erc-scenarios-ignore.el +++ b/test/lisp/erc/erc-scenarios-ignore.el @@ -29,9 +29,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-ignore/basic () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/multi-net") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-join-auth-source.el b/test/lisp/erc/erc-scenarios-join-auth-source.el index 7953179c0df..3fa1a57318a 100644 --- a/test/lisp/erc/erc-scenarios-join-auth-source.el +++ b/test/lisp/erc/erc-scenarios-join-auth-source.el @@ -28,9 +28,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-auth-source--network () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should erc-auth-source-join-function) (erc-scenarios-common-with-cleanup ((entries diff --git a/test/lisp/erc/erc-scenarios-join-display-context.el b/test/lisp/erc/erc-scenarios-join-display-context.el index 6d0f3181fe1..07d7ff1519e 100644 --- a/test/lisp/erc/erc-scenarios-join-display-context.el +++ b/test/lisp/erc/erc-scenarios-join-display-context.el @@ -33,9 +33,8 @@ ;; removes the affected channel's name from the list so that any calls ;; to `display-buffer' in `erc-setup-buffer' on subsequent JOINs aren't ;; misled into thinking the JOIN was module-initiated. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-display-context--errors () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "join/buffer-display") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-join-netid-newcmd-id.el b/test/lisp/erc/erc-scenarios-join-netid-newcmd-id.el index 27271995ef3..7ee37c33c8a 100644 --- a/test/lisp/erc/erc-scenarios-join-netid-newcmd-id.el +++ b/test/lisp/erc/erc-scenarios-join-netid-newcmd-id.el @@ -24,9 +24,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-netid--newcmd-id () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((connect (lambda () (erc :server "127.0.0.1" :port (with-current-buffer "oofnet" @@ -37,9 +36,8 @@ :id 'oofnet)))) (erc-scenarios-common--join-network-id connect 'oofnet nil))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-netid--newcmd-ids () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((connect (lambda () (erc :server "127.0.0.1" :port (with-current-buffer "oofnet" diff --git a/test/lisp/erc/erc-scenarios-join-netid-newcmd.el b/test/lisp/erc/erc-scenarios-join-netid-newcmd.el index 27ec0a91e35..ff18410962b 100644 --- a/test/lisp/erc/erc-scenarios-join-netid-newcmd.el +++ b/test/lisp/erc/erc-scenarios-join-netid-newcmd.el @@ -24,9 +24,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-netid--newcmd () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((connect (lambda () (erc :server "127.0.0.1" :port (with-current-buffer "foonet" diff --git a/test/lisp/erc/erc-scenarios-join-netid-recon-id.el b/test/lisp/erc/erc-scenarios-join-netid-recon-id.el index 21c66a590ee..c7d5b3f1515 100644 --- a/test/lisp/erc/erc-scenarios-join-netid-recon-id.el +++ b/test/lisp/erc/erc-scenarios-join-netid-recon-id.el @@ -24,9 +24,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-netid--recon-id () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((connect (lambda () (with-current-buffer "oofnet" (erc-cmd-RECONNECT) @@ -35,9 +34,8 @@ (current-buffer))))) (erc-scenarios-common--join-network-id connect 'oofnet nil))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-netid--recon-ids () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((connect (lambda () (with-current-buffer "oofnet" (erc-cmd-RECONNECT) diff --git a/test/lisp/erc/erc-scenarios-join-netid-recon.el b/test/lisp/erc/erc-scenarios-join-netid-recon.el index 5f5f3c21ba1..d9ce24abc6d 100644 --- a/test/lisp/erc/erc-scenarios-join-netid-recon.el +++ b/test/lisp/erc/erc-scenarios-join-netid-recon.el @@ -24,9 +24,8 @@ (let ((load-path (cons (ert-resource-directory) load-path))) (require 'erc-scenarios-common))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-netid--recon () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((connect (lambda () (with-current-buffer "foonet" (erc-cmd-RECONNECT) diff --git a/test/lisp/erc/erc-scenarios-join-timing.el b/test/lisp/erc/erc-scenarios-join-timing.el index 838b568b95a..68c38630872 100644 --- a/test/lisp/erc/erc-scenarios-join-timing.el +++ b/test/lisp/erc/erc-scenarios-join-timing.el @@ -72,9 +72,8 @@ ;; `connect'. Here, ERC emits the JOIN request before being informed by ;; NickServ that it needs to log in. The server then holds off on ;; granting the JOIN until authentication has completed. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-timing/connect () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-autojoin-timing 'connect)) (erc-scenarios-join-timing--services-identify-both 'connect-both)) @@ -84,9 +83,8 @@ ;; arranges not to request a JOIN until it's been authenticated by the ;; server. Since `erc-autojoin-delay' remains at its default of 30, ;; authentication occurs before the fallback timer fires. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-join-timing/ident () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-autojoin-timing 'connect)) (should (= erc-autojoin-delay 30)) diff --git a/test/lisp/erc/erc-scenarios-keep-place-indicator-trunc.el b/test/lisp/erc/erc-scenarios-keep-place-indicator-trunc.el index 2469e7f7209..68d8780ef0a 100644 --- a/test/lisp/erc/erc-scenarios-keep-place-indicator-trunc.el +++ b/test/lisp/erc/erc-scenarios-keep-place-indicator-trunc.el @@ -26,11 +26,9 @@ (require 'erc-goodies) -;; Fails in batch: signal (ert-deftest erc-scenarios-keep-place-indicator-trunc () :tags `(:expensive-test - ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical)) - :nobatch) + ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical))) (when (and noninteractive (= emacs-major-version 27)) (ert-skip "Times out")) diff --git a/test/lisp/erc/erc-scenarios-keep-place-indicator.el b/test/lisp/erc/erc-scenarios-keep-place-indicator.el index e46b015e43b..332247667eb 100644 --- a/test/lisp/erc/erc-scenarios-keep-place-indicator.el +++ b/test/lisp/erc/erc-scenarios-keep-place-indicator.el @@ -29,12 +29,10 @@ ;; This test shows that the indicator does not update when at least ;; one window remains. When the last window showing a buffer switches ;; away, the indicator is updated if it's earlier in the buffer. -;; Fails in batch: signal (ert-deftest erc-scenarios-keep-place-indicator--follow () :tags `(:expensive-test ,@(and (getenv "EMACS_EMBA_CI") '(:unstable)) - ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical)) - :nobatch) + ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical))) ;; ERC's tests also run in external CI that exports this variable. ;; Skip on 27 because `erc-scrolltobottom-all' currently requires 28+. diff --git a/test/lisp/erc/erc-scenarios-log.el b/test/lisp/erc/erc-scenarios-log.el index 8904285d3d5..063cdfdcfd4 100644 --- a/test/lisp/erc/erc-scenarios-log.el +++ b/test/lisp/erc/erc-scenarios-log.el @@ -31,9 +31,8 @@ (defvar erc-timestamp-format-left) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-log--kill-hook () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/bouncer-history") (dumb-server (erc-d-run "localhost" t 'foonet)) @@ -86,9 +85,8 @@ ;; originally had a nil insertion type. This staggered alignment means ;; truncation resulting from a /CLEAR actually demands more twiddling ;; and care than that triggered by the `truncate' module. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-log--cmd-clear/date-stamps () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (require 'erc-stamp) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/bouncer-history") @@ -163,9 +161,8 @@ (erc-log-mode -1))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-log--cmd-clear/left-stamps () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/bouncer-history") (dumb-server (erc-d-run "localhost" t 'foonet)) @@ -333,9 +330,8 @@ (defvar erc-insert-timestamp-function) (declare-function erc-insert-timestamp-left "erc-stamp" (string)) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-log--save-buffer-in-logs/truncate-on-save () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (with-suppressed-warnings ((obsolete erc-truncate-buffer-on-save)) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/assoc/bouncer-history") diff --git a/test/lisp/erc/erc-scenarios-match.el b/test/lisp/erc/erc-scenarios-match.el index 79a9b4b49ff..bc5ebe27ce9 100644 --- a/test/lisp/erc/erc-scenarios-match.el +++ b/test/lisp/erc/erc-scenarios-match.el @@ -38,9 +38,8 @@ ;; message, which doesn't exist, when the message content is prefixed ;; by a leading timestamp. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--stamp-left-current-nick () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/reconnect") (dumb-server (erc-d-run "localhost" t 'unexpected-disconnect)) @@ -125,9 +124,8 @@ ;; This asserts that when stamps appear before a message, registered ;; invisibility properties owned by modules span the entire message. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--stamp-left-fools-invisible () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-insert-timestamp-function #'erc-insert-timestamp-left)) (erc-scenarios-match--invisible-stamp @@ -204,14 +202,12 @@ (should (eq (get-text-property inv-beg 'invisible) 'timestamp)))))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--stamp-right-fools-invisible () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-match--stamp-right-fools-invisible)) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--stamp-right-fools-invisible--nooffset () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (with-suppressed-warnings ((obsolete erc-legacy-invisible-bounds-p)) (should-not erc-legacy-invisible-bounds-p) (let ((erc-legacy-invisible-bounds-p t)) @@ -219,9 +215,8 @@ ;; This asserts that when `erc-fill-wrap-mode' is enabled, ERC hides ;; the preceding message's line ending. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--stamp-right-invisible-fill-wrap () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-insert-timestamp-function #'erc-insert-timestamp-right) (erc-fill-function #'erc-fill-wrap)) (erc-scenarios-match--invisible-stamp @@ -270,9 +265,7 @@ (`(space :width (- erc-fill--wrap-value ,n)) (< 10 n 30)))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--hide-fools/stamp-both/fill-wrap () - :tags '(:nobatch) ;; Rewind the clock to known date artificially. We should probably ;; use a ticks/hz cons on 29+. @@ -379,9 +372,7 @@ ;; take place after a series of hidden fool messages with an ;; intervening outgoing message followed immediately by a non-fool ;; message from the last non-hidden speaker (other than the user). -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--hide-fools/stamp-both/fill-wrap/speak () - :tags '(:nobatch) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "match/fools") @@ -520,11 +511,8 @@ (should-not (next-single-property-change (pos-bol) 'invisible)))))) ;; FIXME explain why these next two fail on FreeBSD 14.2 (Bug#74722). -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--stamp-both-invisible-fill-static () - :tags `(:expensive-test - ,@(and (eq system-type 'berkeley-unix) '(:unstable)) - :nobatch) + :tags `(:expensive-test ,@(and (eq system-type 'berkeley-unix) '(:unstable))) (erc-scenarios-match--stamp-both-invisible-fill-static (lambda () @@ -539,11 +527,8 @@ 'invisible 'timestamp) (match-end 0))))))) ; pos-eol -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-match--stamp-both-invisible-fill-static--nooffset () - :tags `(:expensive-test - ,@(and (eq system-type 'berkeley-unix) '(:unstable)) - :nobatch) + :tags `(:expensive-test ,@(and (eq system-type 'berkeley-unix) '(:unstable))) (with-suppressed-warnings ((obsolete erc-legacy-invisible-bounds-p)) (should-not erc-legacy-invisible-bounds-p) diff --git a/test/lisp/erc/erc-scenarios-misc-commands.el b/test/lisp/erc/erc-scenarios-misc-commands.el index de27f5afe10..933a2e2f968 100644 --- a/test/lisp/erc/erc-scenarios-misc-commands.el +++ b/test/lisp/erc/erc-scenarios-misc-commands.el @@ -27,9 +27,8 @@ ;; This defends against a partial regression in which an /MOTD caused ;; 376 and 422 handlers in erc-networks to run. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-misc-commands--MOTD () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "commands") (erc-server-flood-penalty 0.1) @@ -70,9 +69,8 @@ (erc-cmd-QUIT ""))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-misc-commands--SQUERY () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "commands") (erc-server-flood-penalty 0.1) @@ -97,9 +95,8 @@ ;; named `erc-cmd-vhost'. At the moment, this test merely exists to ;; assert that the `erc-server-396' response handler updates the rolls ;; correctly. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-misc-commands--VHOST () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "commands") (erc-server-flood-penalty 0.1) @@ -133,9 +130,7 @@ ;; unaddressed are interactions with the `command-indicator' module ;; (`erc-noncommands-list') and whatever future `echo-message' ;; implementation manifests out of bug#49860. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-misc-commands--AMSG-GMSG-AME-GME () - :tags '(:nobatch) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "commands") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-misc.el b/test/lisp/erc/erc-scenarios-misc.el index 06d93509bbe..e973c912cf9 100644 --- a/test/lisp/erc/erc-scenarios-misc.el +++ b/test/lisp/erc/erc-scenarios-misc.el @@ -26,9 +26,8 @@ (eval-when-compile (require 'erc-join)) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-flood () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/flood") (dumb-server (erc-d-run "localhost" t 'soju)) @@ -85,9 +84,8 @@ ;; with `ert-skip' plus some condition so it only runs when explicitly ;; named via ERT specifier -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-networks-announced-missing () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "networks/announced-missing") (expect (erc-d-t-make-expecter)) @@ -109,9 +107,8 @@ ;; Targets that are host/server masks like $*, $$*, and #* are routed ;; to the server buffer: https://github.com/ircdocs/wooooms/issues/5 -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-mask-target-routing () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/mask-target-routing") (dumb-server (erc-d-run "localhost" t 'foonet)) @@ -141,9 +138,8 @@ (should-not (get-buffer "$*")))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-dcc-chat-accept () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "dcc/chat") (dcc-server (erc-d-run "127.0.0.1" t "erc-dcc-server" 'accept-dcc @@ -183,9 +179,8 @@ (defvar url-irc-function) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-handle-irc-url () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "join/legacy") (dumb-server (erc-d-run "localhost" t 'foonet)) @@ -216,9 +211,8 @@ (declare-function erc-track-switch-buffer "erc-track" (arg)) (defvar erc-track-mode) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-base-kill-server-track () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "networks/merge-server") (dumb-server (erc-d-run "localhost" t 'track)) diff --git a/test/lisp/erc/erc-scenarios-nicks-track.el b/test/lisp/erc/erc-scenarios-nicks-track.el index aeb7b7688ab..7f7792ccb68 100644 --- a/test/lisp/erc/erc-scenarios-nicks-track.el +++ b/test/lisp/erc/erc-scenarios-nicks-track.el @@ -27,9 +27,8 @@ (require 'erc-track) (require 'erc-nicks) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-nicks-track/prioritize () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-nicks-track-faces 'prioritize)) @@ -127,9 +126,8 @@ (funcall expect 10 "has quit") (funcall assert-result '(7 . erc-notice-face))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-nicks-track/defer () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-nicks-track-faces 'prioritize)) @@ -230,9 +228,8 @@ (funcall expect 10 "has quit") (funcall assert-result '(7 . erc-notice-face))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-nicks-track/nil () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-nicks-track-faces 'prioritize)) @@ -332,9 +329,8 @@ (funcall expect 10 "has quit") (funcall assert-result '(7 . erc-notice-face))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-nicks-track/t () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (should (eq erc-nicks-track-faces 'prioritize)) diff --git a/test/lisp/erc/erc-scenarios-prompt-format.el b/test/lisp/erc/erc-scenarios-prompt-format.el index 420078d3372..116cd6b8cc9 100644 --- a/test/lisp/erc/erc-scenarios-prompt-format.el +++ b/test/lisp/erc/erc-scenarios-prompt-format.el @@ -37,9 +37,8 @@ ;; This makes assertions about the option `erc-fill-wrap-align-prompt' ;; as well as the standard value of `erc-prompt-format'. One minor ;; omission is that this doesn't check behavior in query buffers. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-prompt-format () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/modes") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-sasl.el b/test/lisp/erc/erc-scenarios-sasl.el index 9be2d8664fb..c7ea3e46997 100644 --- a/test/lisp/erc/erc-scenarios-sasl.el +++ b/test/lisp/erc/erc-scenarios-sasl.el @@ -26,9 +26,8 @@ (require 'erc-sasl) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-sasl--plain () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "sasl") (erc-server-flood-penalty 0.1) @@ -55,9 +54,8 @@ ;; The user's unreasonably long password is apportioned into chunks on ;; the way out the door. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-sasl--plain-overlong-split () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "sasl") (erc-server-flood-penalty 0.1) @@ -89,9 +87,8 @@ (funcall expect 10 "This server is in debug mode") (erc-cmd-QUIT ""))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-sasl--plain-overlong-aligned () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "sasl") (erc-server-flood-penalty 0.1) @@ -118,9 +115,8 @@ (funcall expect 10 "This server is in debug mode") (erc-cmd-QUIT ""))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-sasl--external () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "sasl") (erc-server-flood-penalty 0.1) @@ -143,9 +139,8 @@ (funcall expect 10 "Authentication successful") (funcall expect 10 "This server is in debug mode"))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-sasl--plain-fail () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "sasl") (erc-server-flood-penalty 0.1) @@ -201,15 +196,13 @@ (funcall expect 10 "Found your hostname") (funcall expect 20 "marked as being away"))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-sasl--scram-sha-1 () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-sasl-authzid "jilles")) (erc-scenarios--common--sasl 'scram-sha-1))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-sasl--scram-sha-256 () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (unless (featurep 'sasl-scram-sha256) (ert-skip "Emacs lacks sasl-scram-sha256")) (erc-scenarios--common--sasl 'scram-sha-256)) diff --git a/test/lisp/erc/erc-scenarios-scrolltobottom-relaxed.el b/test/lisp/erc/erc-scenarios-scrolltobottom-relaxed.el index 5c6dd7f9d2b..7dd659a14d2 100644 --- a/test/lisp/erc/erc-scenarios-scrolltobottom-relaxed.el +++ b/test/lisp/erc/erc-scenarios-scrolltobottom-relaxed.el @@ -29,11 +29,9 @@ (require 'erc-goodies) -;; Fails in batch: signal (ert-deftest erc-scenarios-scrolltobottom--relaxed () :tags `(:expensive-test - ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical)) - :nobatch) + ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical))) (when (version< emacs-version "29") (ert-skip "Times out")) (should-not erc-scrolltobottom-all) diff --git a/test/lisp/erc/erc-scenarios-scrolltobottom.el b/test/lisp/erc/erc-scenarios-scrolltobottom.el index c1803ab4864..099ff30001c 100644 --- a/test/lisp/erc/erc-scenarios-scrolltobottom.el +++ b/test/lisp/erc/erc-scenarios-scrolltobottom.el @@ -29,11 +29,9 @@ ;; These two actually seem to run fine on Emacs 28, but skip them for ;; now to stay in sync with `erc-scenarios-scrolltobottom--relaxed'. -;; Fails in batch: signal (ert-deftest erc-scenarios-scrolltobottom--normal () - :tags `(:expensive-test - ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical)) - :nobatch) + :tags `(:expensive-test ,@(and (getenv "ERC_TESTS_GRAPHICAL") + '(:erc--graphical))) (when (version< emacs-version "29") (ert-skip "Times out")) (should-not erc-scrolltobottom-all) @@ -47,11 +45,9 @@ (erc-d-t-wait-for 10 (not (erc-scenarios-common--at-win-end-p w)))))))) -;; Fails in batch: signal (ert-deftest erc-scenarios-scrolltobottom--all () - :tags `(:expensive-test - ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical)) - :nobatch) + :tags `(:expensive-test ,@(and (getenv "ERC_TESTS_GRAPHICAL") + '(:erc--graphical))) (when (version< emacs-version "29") (ert-skip "Times out")) (should-not erc-scrolltobottom-all) diff --git a/test/lisp/erc/erc-scenarios-services-misc.el b/test/lisp/erc/erc-scenarios-services-misc.el index 596de76c1cc..bc6522ae110 100644 --- a/test/lisp/erc/erc-scenarios-services-misc.el +++ b/test/lisp/erc/erc-scenarios-services-misc.el @@ -27,9 +27,8 @@ (eval-when-compile (require 'erc-join) (require 'erc-services)) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-password () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "services/password") @@ -57,9 +56,8 @@ (should-not (memq 'services erc-modules)))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-prompt () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "services/password") (erc-server-flood-penalty 0.1) @@ -92,9 +90,8 @@ ;; `erc-auth-source-server-function' runs -- initially *or* on ;; reconnect. It's only seen by `erc-auth-source-services-function'. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-auth-source-reconnect () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "services/auth-source") (erc-server-flood-penalty 0.1) @@ -151,9 +148,8 @@ ;; placeholder and successfully renicks once the connection is up. ;; See also `erc-scenarios-base-renick-self-auto'. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-misc--reconnect-retry-nick () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-server-flood-penalty 0.1) (erc-scenarios-common-dialog "services/regain") @@ -199,9 +195,8 @@ ;; This only asserts that the handler fires and issues the right ;; NickServ command, but it doesn't accurately recreate a ;; disconnection, but it probably should. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-misc--regain-command () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-server-flood-penalty 0.1) (erc-scenarios-common-dialog "services/regain") @@ -229,9 +224,8 @@ ;; Works with "given" `:id'. (should (and (erc-network) (not (eq (erc-network) 'ExampleNet))))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-misc--regain-command/oftc () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-server-flood-penalty 0.1) (erc-scenarios-common-dialog "services/regain") @@ -255,9 +249,8 @@ (funcall expect 10 "*** Your new nickname is dummy") (funcall expect 10 "*** dummy has changed mode for dummy to +R")))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-services-misc--ghost-and-retry-nick () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-server-flood-penalty 0.1) (erc-scenarios-common-dialog "services/regain") diff --git a/test/lisp/erc/erc-scenarios-stamp.el b/test/lisp/erc/erc-scenarios-stamp.el index a12d896123e..25dded4b728 100644 --- a/test/lisp/erc/erc-scenarios-stamp.el +++ b/test/lisp/erc/erc-scenarios-stamp.el @@ -40,9 +40,7 @@ ;; `erc-server-004' only prints up to the 5th parameter. (should (looking-back "CEIMRUabefhiklmnoqstuv\n")))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-stamp--left/display-margin-mode () - :tags '(:nobatch) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/reconnect") @@ -88,9 +86,7 @@ (should (looking-back "CEIMRUabefhiklmnoqstuv\n")) (should (looking-at (rx "["))))))))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-stamp--legacy-date-stamps () - :tags '(:nobatch) (with-suppressed-warnings ((obsolete erc-stamp-prepend-date-stamps-p)) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/reconnect") @@ -146,9 +142,7 @@ (setq erc-timestamp-last-inserted-left nil) (set-marker erc-scenarios-stamp--user-marker erc-insert-marker))) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-stamp--date-mode/left-and-right () - :tags '(:nobatch) (should (eq erc-insert-timestamp-function #'erc-insert-timestamp-left-and-right)) @@ -188,9 +182,8 @@ ;; Assert that only one date stamp per day appears in the server ;; buffer when reconnecting. -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-stamp--date-mode/reconnect () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/reconnect") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-scenarios-status-sidebar.el b/test/lisp/erc/erc-scenarios-status-sidebar.el index f4093425e25..ede387ac451 100644 --- a/test/lisp/erc/erc-scenarios-status-sidebar.el +++ b/test/lisp/erc/erc-scenarios-status-sidebar.el @@ -27,9 +27,8 @@ (require 'erc-status-sidebar) -;; Fails in batch: make-network-process (ert-deftest erc-scenarios-status-sidebar--bufbar () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-scenarios-common-with-cleanup ((erc-scenarios-common-dialog "base/gapless-connect") (erc-server-flood-penalty 0.1) diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 7651e2efdb8..6d0172e98fc 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el @@ -3369,9 +3369,7 @@ :password "sesame" :full-name "nick"))))) -;; Fails in batch: signal (ert-deftest erc-tls () - :tags '(:nobatch) (let (calls env) (cl-letf ((inhibit-message noninteractive) ((symbol-function 'user-login-name) @@ -3488,9 +3486,7 @@ ;; See `erc-select-read-args' above for argument parsing. ;; This only tests the "hidden" arguments. -;; Fails in batch: signal (ert-deftest erc--interactive () - :tags '(:nobatch) (let (calls env) (cl-letf ((inhibit-message noninteractive) ((symbol-function 'user-login-name) @@ -3527,9 +3523,7 @@ (erc-server-connect-function erc-open-network-stream)))))))) -;; Fails in batch: signal (ert-deftest erc-server-select () - :tags '(:nobatch) (let (calls env) (cl-letf ((inhibit-message noninteractive) ((symbol-function 'user-login-name) diff --git a/test/lisp/erc/resources/erc-d/erc-d-tests.el b/test/lisp/erc/resources/erc-d/erc-d-tests.el index 201ff6e85ef..b161ea17305 100644 --- a/test/lisp/erc/resources/erc-d/erc-d-tests.el +++ b/test/lisp/erc/resources/erc-d/erc-d-tests.el @@ -31,9 +31,7 @@ ;; Temporary kludge to silence warning (put 'erc-parse-tags 'erc-v3-warned-p t) -;; Fails in batch: signal (ert-deftest erc-d-u--canned-load-dialog--basic () - :tags '(:nobatch) (should-not (get-buffer "basic.eld")) (should-not erc-d-u--canned-buffers) (let* ((exes (erc-d-u--canned-load-dialog 'basic)) @@ -64,9 +62,7 @@ (lambda () (erc-d-u--read-exchange p)))) ;; Fuzzies need to be able to access any non-exhausted genny. -;; Fails in batch: signal (ert-deftest erc-d-u--canned-load-dialog--intermingled () - :tags '(:nobatch) (should-not (get-buffer "basic.eld")) (should-not erc-d-u--canned-buffers) (let* ((exes (erc-d-u--canned-load-dialog 'basic)) @@ -118,9 +114,7 @@ ;; This indirectly tests `erc-d-u--canned-read' cleanup/teardown -;; Fails in batch: signal (ert-deftest erc-d-u--rewrite-for-slow-mo () - :tags '(:nobatch) (should-not (get-buffer "basic.eld")) (should-not (get-buffer "basic.eld<2>")) (should-not (get-buffer "basic.eld<3>")) @@ -641,9 +635,8 @@ nonzero for this to work." (advice-remove sym 'spy)) (setq ,found (nreverse ,found)))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-nonstandard-messages () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* ((erc-d-linger-secs 0.2) (dumb-server (erc-d-run "localhost" t 'nonstandard)) (dumb-server-buffer (get-buffer "*erc-d-server*")) @@ -676,18 +669,16 @@ nonzero for this to work." (when noninteractive (kill-buffer dumb-server-buffer)))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-basic () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (erc-d-tests-with-server (_ _) basic (with-current-buffer (erc-d-t-wait-for 10 (get-buffer "#chan")) (erc-d-t-search-for 2 "hey")) (when noninteractive (kill-buffer "#chan")))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-eof () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (skip-unless noninteractive) (erc-d-tests-with-server (_ erc-s-buf) eof (with-current-buffer (erc-d-t-wait-for 3 (get-buffer "#chan")) @@ -695,9 +686,8 @@ nonzero for this to work." (with-current-buffer erc-s-buf (process-send-eof erc-server-process)))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-eof-fail () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let (errors) (erc-d-tests-with-failure-spy errors '(erc-d--teardown) (erc-d-tests-with-server (_ _) eof @@ -795,9 +785,8 @@ nonzero for this to work." (kill-buffer client-buffer-b) (kill-buffer dumb-server-buffer)))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-no-match () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-d-linger-secs 1) erc-server-auto-reconnect errors) @@ -810,9 +799,8 @@ nonzero for this to work." (should (string-match-p "Match failed.*foo.*chan" (cadr (pop errors)))) (should-not (get-buffer "#foo")))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-timeout () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-d-linger-secs 1) err errors) (erc-d-tests-with-failure-spy errors '(erc-d--teardown) @@ -822,9 +810,8 @@ nonzero for this to work." (should (eq (car err) 'erc-d-timeout)) (should (string-match-p "Timed out" (cadr err))))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-unexpected () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-d-linger-secs 2) errors) (erc-d-tests-with-failure-spy @@ -837,9 +824,8 @@ nonzero for this to work." ;; first error was thrown (should (string-match-p "Match failed" (cadr (pop errors)))))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-unexpected-depleted () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-d-linger-secs 3) errors) (erc-d-tests-with-failure-spy errors '(erc-d--teardown erc-d-command) @@ -901,9 +887,8 @@ nonzero for this to work." (when noninteractive (kill-buffer "#chan")))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-dynamic-default-match () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* (dynamic-tally (erc-d-tmpl-vars '((user . "user") (ignored . ((a b) (: a space b))) @@ -927,9 +912,8 @@ nonzero for this to work." (should (equal '((dom . match-user) (nick . match-user) (dom . match-user)) dynamic-tally)))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-dynamic-default-match-rebind () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* (tally ;; (erc-d-tmpl-vars '((user . "user") @@ -957,9 +941,8 @@ nonzero for this to work." (erc-d-tests--run-dynamic) (should (equal '(bind-nick bind-dom) tally)))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-dynamic-runtime-stub () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-d-tmpl-vars '((token . (group (or "barnet" "foonet"))))) (erc-d-match-handlers (list :pass (lambda (d _e) @@ -977,9 +960,8 @@ nonzero for this to work." (when noninteractive (kill-buffer "#chan"))))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-dynamic-runtime-stub-skip () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-d-tmpl-vars '((token . "barnet"))) (erc-d-match-handlers (list :pass (lambda (d _e) @@ -999,9 +981,8 @@ nonzero for this to work." (kill-buffer "#chan"))))) ;; Two servers, in-process, one client per -;; Fails in batch: make-network-process (ert-deftest erc-d-run-dual-direct () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* ((erc-d--slow-mo -1) (server-a (erc-d-run "localhost" t "erc-d-server-a" 'dynamic-foonet)) (server-b (erc-d-run "localhost" t "erc-d-server-b" 'dynamic-barnet)) @@ -1050,9 +1031,8 @@ nonzero for this to work." (kill-buffer server-b-buffer)))) ;; This can be removed; only exists to get a baseline for next test -;; Fails in batch: make-network-process (ert-deftest erc-d-run-fuzzy-direct () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* ((erc-d-tmpl-vars `((now . ,(lambda () (format-time-string "%FT%T.%3NZ" nil t))))) (dumb-server (erc-d-run "localhost" t 'fuzzy)) @@ -1092,9 +1072,8 @@ nonzero for this to work." (kill-buffer dumb-server-buffer)))) ;; Without adjusting penalty, takes ~15 secs. With is comparable to direct ^. -;; Fails in batch: make-network-process (ert-deftest erc-d-run-fuzzy () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-server-flood-penalty 1.2) ; penalty < margin/sends is basically 0 (erc-d-linger-secs 0.1) (erc-d-tmpl-vars @@ -1114,9 +1093,8 @@ nonzero for this to work." (with-current-buffer "#foo" (erc-d-t-search-for 5 "was created on"))))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-no-block () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-server-flood-penalty 1) (erc-d-linger-secs 1.2) (expect (erc-d-t-make-expecter)) @@ -1207,9 +1185,8 @@ bouncer-like setup." ;; everything needed for the whole session in `erc-d-tmpl-vars' before ;; starting the server. -;; Fails in batch: make-network-process (ert-deftest erc-d-run-proxy-direct-spec-vars () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* ((dumb-server-buffer (get-buffer-create "*erc-d-server*")) (erc-d-linger-secs 0.5) (erc-d-tmpl-vars @@ -1250,9 +1227,8 @@ DIALOGS are symbols representing the base names of dialog files in (let ((pair (read buffer))) (cons proc (cdr pair))))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-proxy-direct-subprocess () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* ((buffer (get-buffer-create "*erc-d-server*")) ;; These are quoted because they're passed as printed forms to subproc (fqdn '(lambda (a e) @@ -1277,9 +1253,8 @@ DIALOGS are symbols representing the base names of dialog files in (server (pop port))) (erc-d-tests--run-proxy-direct server buffer port))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-proxy-direct-subprocess-lib () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* ((buffer (get-buffer-create "*erc-d-server*")) (lib (expand-file-name "proxy-subprocess.el" (ert-resource-directory))) @@ -1290,9 +1265,8 @@ DIALOGS are symbols representing the base names of dialog files in (server (pop port))) (erc-d-tests--run-proxy-direct server buffer port))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-no-pong () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* (erc-d-auto-pong ;; (erc-d-tmpl-vars @@ -1340,9 +1314,8 @@ DIALOGS are symbols representing the base names of dialog files in ;; Inspect replies as they arrive within a single exchange, i.e., ensure we ;; don't regress to prior buggy version in which inspection wasn't possible ;; until all replies had been sent by the server. -;; Fails in batch: make-network-process (ert-deftest erc-d-run-incremental () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let ((erc-server-flood-penalty 0) (expect (erc-d-t-make-expecter)) erc-d-linger-secs) @@ -1358,9 +1331,8 @@ DIALOGS are symbols representing the base names of dialog files in (funcall expect 10 "Done") (erc-send-message "Hi"))))) -;; Fails in batch: make-network-process (ert-deftest erc-d-unix-socket-direct () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (skip-unless (featurep 'make-network-process '(:family local))) (let* ((erc-d-linger-secs 0.1) (sock (expand-file-name "erc-d.sock" temporary-file-directory)) @@ -1396,9 +1368,8 @@ DIALOGS are symbols representing the base names of dialog files in (kill-buffer dumb-server-buffer))) (delete-file sock)))) -;; Fails in batch: make-network-process (ert-deftest erc-d-run-direct-foreign-protocol () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) (let* ((server (erc-d-run "localhost" t "erc-d-server" 'foreign :ending "\n")) (server-buffer (get-buffer "*erc-d-server*")) diff --git a/test/lisp/eshell/esh-proc-tests.el b/test/lisp/eshell/esh-proc-tests.el index 730cd9cb39e..880fca2ae02 100644 --- a/test/lisp/eshell/esh-proc-tests.el +++ b/test/lisp/eshell/esh-proc-tests.el @@ -174,9 +174,7 @@ See bug#71778." ;; pipeline. (should (= eshell-last-command-status 0))))) -;; Fails in batch: signal (ert-deftest esh-proc-test/pipeline-connection-type/no-pipeline () - :tags '(:nobatch) "Test that all streams are PTYs when a command is not in a pipeline." (skip-unless (executable-find "sh")) (eshell-command-result-equal @@ -185,9 +183,7 @@ See bug#71778." (unless (eq system-type 'windows-nt) "stdin\nstdout\nstderr\n"))) -;; Fails in batch: signal (ert-deftest esh-proc-test/pipeline-connection-type/first () - :tags '(:nobatch) "Test that only stdin is a PTY when a command starts a pipeline." (skip-unless (and (executable-find "sh") (executable-find "cat"))) @@ -205,9 +201,7 @@ pipeline." (concat "(ignore) | " esh-proc-test--detect-pty-cmd " | cat") nil)) -;; Fails in batch: signal (ert-deftest esh-proc-test/pipeline-connection-type/last () - :tags '(:nobatch) "Test that only output streams are PTYs when a command ends a pipeline." (skip-unless (executable-find "sh")) (eshell-command-result-equal @@ -308,9 +302,7 @@ prompt. See bug#54136." (kill-process (eshell-head-process))) (should (equal (buffer-string) "")))) -;; Fails in batch: signal (ert-deftest esh-proc-test/kill-pipeline () - :tags '(:nobatch) "Test that killing a pipeline of processes only emits a single prompt. See bug#54136." (skip-unless (and (executable-find "sh") diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el index d6015f59d95..6cd03206204 100644 --- a/test/lisp/gnus/mml-sec-tests.el +++ b/test/lisp/gnus/mml-sec-tests.el @@ -203,9 +203,7 @@ In both cases, the first key is customized for signing and encryption." (mml-secure-cust-record-keys scontext 'sign "sub@example.org" skey) (funcall body3))))) -;; Fails in batch: signal (ert-deftest mml-secure-key-checks () - :tags '(:nobatch) "Test mml-secure-check-user-id and mml-secure-check-sub-key on sample keys." (skip-unless (test-conf)) (mml-secure-test-fixture @@ -273,9 +271,7 @@ In both cases, the first key is customized for signing and encryption." (should-not (mml-secure-check-sub-key context (car keys7) 'sign)) )))) -;; Fails in batch: signal (ert-deftest mml-secure-find-usable-keys-1 () - :tags '(:nobatch) "Make sure that expired and disabled keys and revoked UIDs are not used." (skip-unless (test-conf)) (mml-secure-test-fixture @@ -314,9 +310,7 @@ In both cases, the first key is customized for signing and encryption." (mml-secure-find-usable-keys context "no-exp@example.org" 'sign)) )))) -;; Fails in batch: signal (ert-deftest mml-secure-find-usable-keys-2 () - :tags '(:nobatch) "Test different ways to search for keys." (skip-unless (test-conf)) (mml-secure-test-fixture @@ -431,9 +425,7 @@ In both cases, the first key is customized for signing and encryption." (should-not (mml-secure-cust-remove-keys context 'encrypt "sub@example.org")))))) -;; Fails in batch: signal (ert-deftest mml-secure-select-preferred-keys-4 () - :tags '(:nobatch) "Multiple keys can be recorded per recipient or signature." (skip-unless (test-conf)) (skip-unless (ignore-errors (epg-find-configuration 'CMS))) @@ -581,9 +573,7 @@ If optional EXPECTFAIL is non-nil, a decryption failure is expected." (mml-secure-test-en-decrypt method to from checksig t enc-keys expectfail) ))) -;; Fails in batch: signal (ert-deftest mml-secure-en-decrypt-1 () - :tags '(:nobatch) "Encrypt message; then decrypt and test for expected result. In this test, the single matching key is chosen automatically." (skip-unless (test-conf)) @@ -593,9 +583,7 @@ In this test, the single matching key is chosen automatically." method "no-exp@example.org" "sub@example.org" nil t (list (cons "A049C1E9179C086B" "ED7A2135E1582177"))))) -;; Fails in batch: signal (ert-deftest mml-secure-en-decrypt-2 () - :tags '(:nobatch) "Encrypt message; then decrypt and test for expected result. In this test, the encryption key needs to fixed among multiple ones." (skip-unless (test-conf)) @@ -609,14 +597,12 @@ In this test, the encryption key needs to fixed among multiple ones." method "sub@example.org" "no-exp@example.org" nil t (list (cons "2FAF8726121EB3C6" "EF25402B479DC6E2"))))))) -;; Fails in batch: signal (ert-deftest mml-secure-en-decrypt-3 () "Encrypt message; then decrypt and test for expected result. In this test, encrypt-to-self variables are set to t." ;; Random failures with "wrong-type-argument stringp nil". ;; Seems unlikely to be specific to hydra.nixos.org... - :tags (append (if (getenv "EMACS_HYDRA_CI") '(:unstable) nil) - '(:nobatch)) + :tags (if (getenv "EMACS_HYDRA_CI") '(:unstable)) (skip-unless (test-conf)) (skip-unless (ignore-errors (epg-find-configuration 'CMS))) ;; sub@example.org with multiple candidate keys, @@ -631,9 +617,7 @@ In this test, encrypt-to-self variables are set to t." (list (cons "2FAF8726121EB3C6" "EF25402B479DC6E2") (cons "A049C1E9179C086B" "ED7A2135E1582177")))))))) -;; Fails in batch: signal (ert-deftest mml-secure-en-decrypt-4 () - :tags '(:nobatch) "Encrypt message; then decrypt and test for expected result. In this test, encrypt-to-self variables are set to lists." (skip-unless (test-conf)) @@ -760,9 +744,7 @@ Use sign-with-sender and encrypt-to-self." (cons "A049C1E9179C086B" "ED7A2135E1582177")))) )))) -;; Fails in batch: signal (ert-deftest mml-secure-sign-verify-1 () - :tags '(:nobatch) "Sign message with sender; then verify and test for expected result." (skip-unless (test-conf)) (skip-unless (ignore-errors (epg-find-configuration 'CMS))) diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el index db103f7157e..ca26f3c5a30 100644 --- a/test/lisp/jsonrpc-tests.el +++ b/test/lisp/jsonrpc-tests.el @@ -105,17 +105,13 @@ (declare (indent 1)) `(jsonrpc--call-with-emacsrpc-fixture (lambda (,endpoint-sym) ,@body))) -;; Fails in batch: make-network-process (ert-deftest returns-3 () - :tags '(:nobatch) "A basic test for adding two numbers in our test RPC." (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-emacsrpc-fixture (conn) (should (= 3 (jsonrpc-request conn '+ [1 2]))))) -;; Fails in batch: make-network-process (ert-deftest errors-with--32601 () - :tags '(:nobatch) "Errors with -32601" (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-emacsrpc-fixture (conn) @@ -126,9 +122,7 @@ (jsonrpc-error (should (= -32601 (cdr (assoc 'jsonrpc-error-code (cdr err))))))))) -;; Fails in batch: make-network-process (ert-deftest signals-an--32603-JSONRPC-error () - :tags '(:nobatch) "Signals an -32603 JSONRPC error." (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-emacsrpc-fixture (conn) @@ -139,26 +133,21 @@ (jsonrpc-error (should (= -32603 (cdr (assoc 'jsonrpc-error-code (cdr err))))))))) -;; Fails in batch: make-network-process (ert-deftest times-out () - :tags '(:nobatch) "Request for 3-sec sit-for with 1-sec timeout times out." (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-emacsrpc-fixture (conn) (should-error (jsonrpc-request conn 'sit-for [3] :timeout 1)))) -;; Fails in batch: make-network-process (ert-deftest doesnt-time-out () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) "Request for 1-sec sit-for with 2-sec timeout succeeds." (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-emacsrpc-fixture (conn) (jsonrpc-request conn 'sit-for [1] :timeout 2))) -;; Fails in batch: make-network-process (ert-deftest stretching-it-but-works () - :tags '(:nobatch) "Vector of numbers or vector of vector of numbers are serialized." (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-emacsrpc-fixture (conn) @@ -174,9 +163,8 @@ (or (not (string-match "deferred" what)) (not (jsonrpc--hold-deferred conn))))) -;; Fails in batch: make-network-process (ert-deftest deferred-action-toolate () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) "Deferred request fails because no one clears the flag." (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-emacsrpc-fixture (conn) @@ -188,9 +176,8 @@ (= 3 (jsonrpc-request conn '+ [1 2] :timeout 0.5))))) -;; Fails in batch: make-network-process (ert-deftest deferred-action-intime () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) "Deferred request barely makes it after event clears a flag." (skip-when (eq system-type 'windows-nt)) ;; Send an async request, which returns immediately. However the @@ -208,9 +195,8 @@ :deferred "deferred" :timeout 1))))) -;; Fails in batch: make-network-process (ert-deftest deferred-action-complex-tests () - :tags '(:expensive-test :nobatch) + :tags '(:expensive-test) "Test a more complex situation with deferred requests." (skip-when (eq system-type 'windows-nt)) (jsonrpc--with-emacsrpc-fixture (conn) diff --git a/test/lisp/net/eudc-tests.el b/test/lisp/net/eudc-tests.el index 53716a14772..5439e4c3b89 100644 --- a/test/lisp/net/eudc-tests.el +++ b/test/lisp/net/eudc-tests.el @@ -268,9 +268,7 @@ Karl Fogel (aref (process-contact server :local) 4) 0))) (delete-process server))) -;; Fails in batch: make-network-process (ert-deftest make-ipv4-tcp-server-with-specified-port () - :tags '(:nobatch) (let ((server (make-network-process :name "server" @@ -172,9 +166,7 @@ (should (equal (buffer-string) "foo\n"))) (delete-process server))) -;; Fails in batch: make-network-process (ert-deftest echo-server-with-localhost () - :tags '(:nobatch) (let* ((server (make-server 'local)) (port (aref (process-contact server :local) 4)) (proc (make-network-process :name "foo" @@ -187,9 +179,7 @@ (should (equal (buffer-string) "foo\n"))) (delete-process server))) -;; Fails in batch: make-network-process (ert-deftest echo-server-with-local-ipv4 () - :tags '(:nobatch) (let* ((server (make-server 'local 'ipv4)) (port (aref (process-contact server :local) 4)) (proc (make-network-process :name "foo" @@ -219,9 +209,7 @@ (should (equal (buffer-string) "foo\n"))) (delete-process server)))) -;; Fails in batch: make-network-process (ert-deftest echo-server-with-ip () - :tags '(:nobatch) (let* ((server (make-server 'local)) (port (aref (process-contact server :local) 4)) (proc (make-network-process :name "foo" @@ -234,9 +222,7 @@ (should (equal (buffer-string) "foo\n"))) (delete-process server))) -;; Fails in batch: make-network-process (ert-deftest echo-server-nowait () - :tags '(:nobatch) (let* ((server (make-server 'local)) (port (aref (process-contact server :local) 4)) (proc (make-network-process :name "foo" @@ -490,9 +476,7 @@ additional parameters to use to start the listening TLS server." (+ 20000 (random 45535)) (vector :nowait t)))) -;; Fails in batch: make-network-process (ert-deftest check-network-process-coding-system-bind () - :tags '(:nobatch) "Check that binding coding-system-for-{read,write} works." (let* ((coding-system-for-read 'binary) (coding-system-for-write 'utf-8-unix) @@ -509,9 +493,7 @@ additional parameters to use to start the listening TLS server." (should (eq (cdr coding) 'utf-8-unix)) (delete-process server))) -;; Fails in batch: make-network-process (ert-deftest check-network-process-coding-system-no-override () - :tags '(:nobatch) "Check that coding-system-for-{read,write} is not overridden by :coding nil." (let* ((coding-system-for-read 'binary) (coding-system-for-write 'utf-8-unix) @@ -529,9 +511,7 @@ additional parameters to use to start the listening TLS server." (should (eq (cdr coding) 'utf-8-unix)) (delete-process server))) -;; Fails in batch: make-network-process (ert-deftest check-network-process-coding-system-override () - :tags '(:nobatch) "Check that :coding non-nil overrides coding-system-for-{read,write}." (let* ((coding-system-for-read 'binary) (coding-system-for-write 'utf-8-unix) diff --git a/test/lisp/net/nsm-tests.el b/test/lisp/net/nsm-tests.el index 5d85aa6f10f..ae3593c553a 100644 --- a/test/lisp/net/nsm-tests.el +++ b/test/lisp/net/nsm-tests.el @@ -27,9 +27,7 @@ (require 'nsm) (eval-when-compile (require 'cl-lib)) -;; Fails in batch: signal (ert-deftest nsm-check-local-subnet-ipv4 () - :tags '(:nobatch) "Check that nsm can be avoided for local subnets." (let ((local-ip '[172 26 128 160 0]) (mask '[255 255 255 0 0]) diff --git a/test/lisp/net/socks-tests.el b/test/lisp/net/socks-tests.el index be0a621e65b..25adafab998 100644 --- a/test/lisp/net/socks-tests.el +++ b/test/lisp/net/socks-tests.el @@ -193,9 +193,7 @@ Vectors must match verbatim. Strings are considered regex patterns.") ;; Unlike curl, socks.el includes the ID field (but otherwise matches): ;; $ curl --proxy socks4://127.0.0.1:1080 example.com -;; Fails in batch: make-network-process (ert-deftest socks-tests-v4-basic () - :tags '(:nobatch) "Show correct preparation of SOCKS4 connect command (Bug#46342)." (let ((socks-server '("server" "127.0.0.1" t 4)) (url-user-agent "Test/4-basic") @@ -211,9 +209,7 @@ Vectors must match verbatim. Strings are considered regex patterns.") (list 93 184 216 34)))) (socks-tests-perform-hello-world-http-request))))) -;; Fails in batch: make-network-process (ert-deftest socks-tests-v4a-basic () - :tags '(:nobatch) "Show correct preparation of SOCKS4a connect command." (let ((socks-server '("server" "127.0.0.1" t 4a)) (socks-username "foo") @@ -225,9 +221,7 @@ Vectors must match verbatim. Strings are considered regex patterns.") (ert-info ("Make HTTP request over SOCKS4A") (socks-tests-perform-hello-world-http-request)))) -;; Fails in batch: signal (ert-deftest socks-tests-v4a-error () - :tags '(:nobatch) "Show error signaled when destination address rejected." (let ((socks-server '("server" "127.0.0.1" t 4a)) (url-user-agent "Test/4a-basic") @@ -245,9 +239,7 @@ Vectors must match verbatim. Strings are considered regex patterns.") ;; against curl 7.71 with the following options: ;; $ curl --verbose -U foo:bar --proxy socks5h://127.0.0.1:10080 example.com -;; Fails in batch: make-network-process (ert-deftest socks-tests-v5-auth-user-pass () - :tags '(:nobatch) "Verify correct handling of SOCKS5 user/pass authentication." (should (assq 2 socks-authentication-methods)) (let ((socks-server '("server" "127.0.0.1" t 5)) @@ -281,9 +273,7 @@ Vectors must match verbatim. Strings are considered regex patterns.") ;; with ([5 3 0 1 2] . [5 2]) and ([1 0 0] . [1 0]), then run: ;; $ curl verbose -U "foo:" --proxy socks5h://127.0.0.1:10081 example.com -;; Fails in batch: make-network-process (ert-deftest socks-tests-v5-auth-user-pass-blank () - :tags '(:nobatch) "Verify correct SOCKS5 user/pass authentication with empty pass." (should (assq 2 socks-authentication-methods)) (let ((socks-server '("server" "127.0.0.1" t 5)) @@ -320,17 +310,13 @@ Vectors must match verbatim. Strings are considered regex patterns.") (socks-tests-perform-hello-world-http-request method))) (should (assq 2 socks-authentication-methods))) -;; Fails in batch: make-network-process (ert-deftest socks-tests-v5-auth-none () - :tags '(:nobatch) (socks-tests-v5-auth-none 'socks)) ;; This simulates the top-level advice around `open-network-stream' ;; that's applied when loading the library with a non-nil ;; `socks-override-functions'. -;; Fails in batch: make-network-process (ert-deftest socks-override-functions () - :tags '(:nobatch) (should-not socks-override-functions) (should-not (advice-member-p #'socks--open-network-stream 'open-network-stream)) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index a2535dbfb7f..28d773ca616 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -5518,10 +5518,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (tramp--test-message "buf: %s\n%s\n---" (current-buffer) (buffer-string)) (ert-fail (format "`%s' timed out" (ert-test-name (ert-running-test))))) -;; Fails in batch: signal (ert-deftest tramp-test29-start-file-process () "Check `start-file-process'." - :tags '(:expensive-test :tramp-asynchronous-processes :nobatch) + :tags '(:expensive-test :tramp-asynchronous-processes) (skip-unless (tramp--test-enabled)) (skip-unless (tramp--test-supports-processes-p)) @@ -5700,12 +5699,7 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." ;; (concat (ert-test-documentation (get ',test 'ert--test)) ;; "\nUse direct async process.") :tags (append '(:expensive-test :tramp-asynchronous-processes) - (and ,unstable '(:unstable)) - (and (memq ',test '(tramp-test29-start-file-process - tramp-test30-make-process - tramp-test32-shell-command - tramp-test33-environment-variables)) - '(:nobatch))) + (and ,unstable '(:unstable))) (skip-unless (tramp--test-enabled)) (let* ((default-directory ert-remote-temporary-file-directory) (ert-test (ert-get-test ',test)) @@ -5729,7 +5723,6 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." (file-truename ert-remote-temporary-file-directory) (funcall (ert-test-body ert-test)))))) -;; Fails in batch: signal (tramp--test-deftest-direct-async-process tramp-test29-start-file-process) (ert-deftest tramp-test30-make-process () @@ -5993,7 +5986,6 @@ If UNSTABLE is non-nil, the test is tagged as `:unstable'." ;; Cleanup. (ignore-errors (delete-process proc))))))))) -;; Fails in batch: signal (tramp--test-deftest-direct-async-process tramp-test30-make-process) (ert-deftest tramp-test31-interrupt-process () @@ -6300,7 +6292,6 @@ INPUT, if non-nil, is a string sent to the process." (when (natnump cols) (should (= cols async-shell-command-width)))))) -;; Fails in batch: signal (tramp--test-deftest-direct-async-process tramp-test32-shell-command) ;; This test is inspired by Bug#39067. @@ -6521,7 +6512,6 @@ INPUT, if non-nil, is a string sent to the process." this-shell-command-to-string "printenv | grep -v PS1 | grep -v _="))))))))) -;; Fails in batch: signal (tramp--test-deftest-direct-async-process tramp-test33-environment-variables) ;; This test is inspired by Bug#27009. diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el index 25a721d9117..1c625d79ca2 100644 --- a/test/lisp/progmodes/python-tests.el +++ b/test/lisp/progmodes/python-tests.el @@ -4984,9 +4984,7 @@ def foo(): (python-shell-interpreter "/some/path/to/bin/pypy")) (should (python-shell-completion-native-interpreter-disabled-p)))) -;; Fails in batch: signal (ert-deftest python-shell-completion-at-point-1 () - :tags '(:nobatch) (python-tests-with-temp-buffer-with-shell-interpreter (when (eq system-type 'darwin) #'python-tests-interpreter-3-p) "" @@ -5000,9 +4998,7 @@ def foo(): (end-of-line 0) (should-not (nth 2 (python-shell-completion-at-point)))))) -;; Fails in batch: signal (ert-deftest python-shell-completion-at-point-native-1 () - :tags '(:nobatch) (python-tests-with-temp-buffer-with-shell-interpreter nil "" @@ -5087,9 +5083,7 @@ def foo(): (string-trim (buffer-string)) "")))) -;; Fails in batch: json-parse-string (ert-deftest python-shell-completion-at-point-jedi-completer () - :tags '(:nobatch) "Check if Python shell completion works when Jedi completer is used." (python-tests-with-shell-interpreter nil @@ -5107,9 +5101,7 @@ def foo(): (python-tests--completion-parameters) (python-tests--completion-extra-context)))))) -;; Fails in batch: json-parse-string (ert-deftest python-shell-completion-at-point-ipython () - :tags '(:nobatch) "Check if Python shell completion works for IPython." (let ((python-shell-interpreter "ipython") (python-shell-interpreter-args "-i --simple-prompt")) @@ -5148,9 +5140,7 @@ def foo(): (python-shell-accept-process-output (python-shell-get-process)) (should (python-ffap-module-path "abc"))) -;; Fails in batch: json-parse-string (ert-deftest python-shell-pdb-1 () - :tags '(:nobatch) "Check if completion and ffap works in Pdb." (ert-with-temp-directory dir (let ((inhibit-message t) @@ -5181,9 +5171,7 @@ from test1 import f1" ;;; Symbol completion -;; Fails in batch: json-parse-string (ert-deftest python-completion-at-point-1 () - :tags '(:nobatch) (python-tests-with-temp-buffer-with-shell-interpreter (when (eq system-type 'darwin) #'python-tests-interpreter-3-p) " @@ -5200,9 +5188,7 @@ import abc (insert "A") (should (completion-at-point))))) -;; Fails in batch: json-parse-string (ert-deftest python-completion-at-point-2 () - :tags '(:nobatch) "Should work regardless of the point in the Shell buffer." (python-tests-with-temp-buffer-with-shell-interpreter (when (eq system-type 'darwin) #'python-tests-interpreter-3-p) @@ -5256,9 +5242,7 @@ time.sleep(3) (insert "time.") (should-not (with-timeout (1 t) (completion-at-point)))))) -;; Fails in batch: json-parse-string (ert-deftest python-completion-at-point-native-1 () - :tags '(:nobatch) (python-tests-with-temp-buffer-with-shell-interpreter (when (eq system-type 'darwin) #'python-tests-interpreter-3-p) " @@ -5276,9 +5260,7 @@ import abc (insert "A") (should (completion-at-point))))) -;; Fails in batch: json-parse-string (ert-deftest python-completion-at-point-native-2 () - :tags '(:nobatch) "Should work regardless of the point in the Shell buffer." (python-tests-with-temp-buffer-with-shell-interpreter (when (eq system-type 'darwin) #'python-tests-interpreter-3-p) @@ -5297,9 +5279,7 @@ import abc (insert "abc.") (should (completion-at-point))))) -;; Fails in batch: json-parse-string (ert-deftest python-completion-at-point-native-with-ffap-1 () - :tags '(:nobatch) (python-tests-with-temp-buffer-with-shell-interpreter (when (eq system-type 'darwin) #'python-tests-interpreter-3-p) " @@ -5317,9 +5297,7 @@ import abc (python-ffap-module-path "abc.") (should (completion-at-point))))) -;; Fails in batch: json-parse-string (ert-deftest python-completion-at-point-native-with-eldoc-1 () - :tags '(:nobatch) (python-tests-with-temp-buffer-with-shell-interpreter (when (eq system-type 'darwin) #'python-tests-interpreter-3-p) " @@ -5346,9 +5324,7 @@ import abc ;;; FFAP -;; Fails in batch: signal (ert-deftest python-ffap-module-path-1 () - :tags '(:nobatch) (python-tests-with-temp-buffer-with-shell-interpreter nil " diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el index 8b262a6edad..a96dc85074d 100644 --- a/test/lisp/server-tests.el +++ b/test/lisp/server-tests.el @@ -122,9 +122,7 @@ process's status matches it." ;;; Tests: -;; Fails in batch: make-network-process (ert-deftest server-tests/server-start/sets-minor-mode () - :tags '(:nobatch) "Ensure that calling `server-start' also sets `server-mode' properly." (server-tests/with-server ;; Make sure starting the server activates the minor mode. @@ -134,9 +132,7 @@ process's status matches it." (should (eq server-mode nil)) (should-not (memq 'server-mode global-minor-modes))) -;; Fails in batch: make-network-process (ert-deftest server-tests/server-start/stop-prompt-with-client () - :tags '(:nobatch) "Ensure that stopping the server prompts when there are clients." (skip-unless server-tests/can-create-frames-p) (server-tests/with-server @@ -149,9 +145,7 @@ process's status matches it." (server-start t) (should yes-or-no-p-called))))) -;; Fails in batch: make-network-process (ert-deftest server-tests/server-start/no-stop-prompt-without-client () - :tags '(:nobatch) "Ensure that stopping the server doesn't prompt when there are no clients." (server-tests/with-server (cl-letf* ((inhibit-message t) @@ -162,9 +156,7 @@ process's status matches it." (server-start t) (should-not yes-or-no-p-called)))) -;; Fails in batch: make-network-process (ert-deftest server-tests/emacsclient/server-edit () - :tags '(:nobatch) "Test that calling `server-edit' from a client buffer exits the client." (server-tests/with-server (server-tests/with-client emacsclient '("file.txt") 'exit @@ -173,9 +165,7 @@ process's status matches it." (with-current-buffer "file.txt" (server-edit))))) -;; Fails in batch: make-network-process (ert-deftest server-tests/emacsclient/create-frame () - :tags '(:nobatch) "Test that \"emacsclient -c\" creates a frame." (skip-unless server-tests/can-create-frames-p) (let ((starting-frame-count (length (frame-list)))) @@ -188,9 +178,7 @@ process's status matches it." ;; The client frame should go away after the server stops. (should (length= (frame-list) starting-frame-count)))) -;; Fails in batch: make-network-process (ert-deftest server-tests/emacsclient/eval () - :tags '(:nobatch) "Test that \"emacsclient --eval\" works correctly." (server-tests/with-server (let ((value (random))) @@ -199,9 +187,7 @@ process's status matches it." 'exit (should (= server-tests/variable value)))))) -;; Fails in batch: make-network-process (ert-deftest server-tests/server-force-stop/keeps-frames () - :tags '(:nobatch) "Ensure that `server-force-stop' doesn't delete frames. See bug#58877. Note: since that bug is about a behavior when killing Emacs, this test is somewhat indirect. (Killing the current Emacs instance diff --git a/test/lisp/tab-bar-tests.el b/test/lisp/tab-bar-tests.el index e3d8d7ba5dd..46aa1f2a845 100644 --- a/test/lisp/tab-bar-tests.el +++ b/test/lisp/tab-bar-tests.el @@ -51,9 +51,7 @@ ;; Clean up tabs afterwards (tab-bar-tabs-set nil)) -;; Fails in batch: make-terminal-frame (ert-deftest tab-bar-tests-quit-restore-window () - :tags '(:nobatch) (skip-when (pcase system-type ;; Skip test on MS-Windows in batch mode, since terminal ;; frames cannot be created in that case. diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el index 0b371782924..ca79a340a46 100644 --- a/test/lisp/vc/vc-tests/vc-tests.el +++ b/test/lisp/vc/vc-tests/vc-tests.el @@ -1108,10 +1108,8 @@ This checks also `vc-backend' and `vc-responsible-backend'." (format "vc-test-%s01-register" backend-string)))))) (vc-test--checkout-model ',backend)) - ;; Fails in batch for SRC: mapcar (ert-deftest ,(intern (format "vc-test-%s05-rename-file" backend-string)) () - :tags (when (eq ',backend 'SRC) '(:nobatch)) ,(format "Check `vc-rename-file' for the %s backend." backend-string) (skip-unless diff --git a/test/lisp/wdired-tests.el b/test/lisp/wdired-tests.el index d05f79bfccf..1108d42da3e 100644 --- a/test/lisp/wdired-tests.el +++ b/test/lisp/wdired-tests.el @@ -131,9 +131,7 @@ wdired-mode." (set-buffer-modified-p nil) (kill-buffer buf)))))))) -;; Fails in batch: make-network-process (ert-deftest wdired-test-bug34915 () - :tags '(:nobatch) "Test editing when dired-listing-switches includes -F. Appended file indicators should not count as part of the file name, either before or after editing. Since diff --git a/test/src/process-tests.el b/test/src/process-tests.el index 8c9088199a8..2cc5b37b187 100644 --- a/test/src/process-tests.el +++ b/test/src/process-tests.el @@ -302,16 +302,12 @@ should be a TTY, respectively." (should (equal (with-current-buffer stdout-buffer (buffer-string)) expected-output)))) -;; Fails in batch: signal (ert-deftest make-process/connection-type/pty () - :tags '(:nobatch) (skip-unless (executable-find "sh")) (make-process/test-connection-type '(t t t) :connection-type 'pty)) -;; Fails in batch: signal (ert-deftest make-process/connection-type/pty-2 () - :tags '(:nobatch) (skip-unless (executable-find "sh")) (make-process/test-connection-type '(t t t) :connection-type '(pty . pty))) @@ -326,31 +322,23 @@ should be a TTY, respectively." (make-process/test-connection-type '(nil nil nil) :connection-type '(pipe . pipe))) -;; Fails in batch: signal (ert-deftest make-process/connection-type/in-pty () - :tags '(:nobatch) (skip-unless (executable-find "sh")) (make-process/test-connection-type '(t nil nil) :connection-type '(pty . pipe))) -;; Fails in batch: signal (ert-deftest make-process/connection-type/out-pty () - :tags '(:nobatch) (skip-unless (executable-find "sh")) (make-process/test-connection-type '(nil t t) :connection-type '(pipe . pty))) -;; Fails in batch: signal (ert-deftest make-process/connection-type/pty-with-stderr-buffer () - :tags '(:nobatch) (skip-unless (executable-find "sh")) (let ((stderr-buffer (generate-new-buffer "*stderr*"))) (make-process/test-connection-type '(t t nil) :connection-type 'pty :stderr stderr-buffer))) -;; Fails in batch: signal (ert-deftest make-process/connection-type/out-pty-with-stderr-buffer () - :tags '(:nobatch) (skip-unless (executable-find "sh")) (let ((stderr-buffer (generate-new-buffer "*stderr*"))) (make-process/test-connection-type '(nil t nil) @@ -755,9 +743,7 @@ FD_SETSIZE file descriptors (Bug#24325)." ;; We should have managed to start at least one process. (should processes)))))) -;; Fails in batch: make-network-process (ert-deftest process-tests/fd-setsize-no-crash/make-network-process () - :tags '(:nobatch) "Check that Emacs doesn't crash when trying to use more than FD_SETSIZE file descriptors (Bug#24325)." ;; Emacs is terminated on Android or aborts when the toolkit fails to @@ -803,9 +789,7 @@ FD_SETSIZE file descriptors (Bug#24325)." ;; We should have managed to start at least one process. (should processes))))))) -;; Fails in batch: signal (ert-deftest process-tests/fd-setsize-no-crash/make-serial-process () - :tags '(:nobatch) "Check that Emacs doesn't crash when trying to use more than FD_SETSIZE file descriptors (Bug#24325)." ;; Emacs is terminated on Android or aborts when the toolkit fails to