From 729b38fa3fa3c34b7b63f055f35b4602ca415c75 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Feb 25 2025 17:25:54 +0000 Subject: Abandon checks There are currently too many intermittent failures to make them useful. --- diff --git a/0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch b/0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch deleted file mode 100644 index 68c21c8..0000000 --- a/0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch +++ /dev/null @@ -1,84 +0,0 @@ -From bf512d1bad98bcd1dc87da93fd2e7f415be14501 Mon Sep 17 00:00:00 2001 -From: Peter Oliver -Date: Mon, 15 Jul 2024 16:19:10 +0100 -Subject: [PATCH 3/4] Mark multiple mml-sec tests as unstable when built in an - RPM - -* test/lisp/gnus/mml-sec-tests.el: Mark unstable tests which have been -seen to intermittently fail at -https://koji.fedoraproject.org/koji/packageinfo?packageID=560 ---- - test/lisp/gnus/mml-sec-tests.el | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el -index 7abd1bd65a3..2bd52bf3ee0 100644 ---- a/test/lisp/gnus/mml-sec-tests.el -+++ b/test/lisp/gnus/mml-sec-tests.el -@@ -210,6 +210,7 @@ mml-secure-test-key-fixture - - (ert-deftest mml-secure-key-checks () - "Test mml-secure-check-user-id and mml-secure-check-sub-key on sample keys." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (test-conf)) - (mml-secure-test-fixture - (lambda () -@@ -278,6 +279,7 @@ mml-secure-key-checks - - (ert-deftest mml-secure-find-usable-keys-1 () - "Make sure that expired and disabled keys and revoked UIDs are not used." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (test-conf)) - (mml-secure-test-fixture - (lambda () -@@ -317,6 +319,7 @@ mml-secure-find-usable-keys-1 - - (ert-deftest mml-secure-find-usable-keys-2 () - "Test different ways to search for keys." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (test-conf)) - (mml-secure-test-fixture - (lambda () -@@ -369,6 +372,7 @@ mml-secure-find-usable-keys-2 - - (ert-deftest mml-secure-select-preferred-keys-1 () - "If only one key exists for an e-mail address, it is the preferred one." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (test-conf)) - (mml-secure-test-fixture - (lambda () -@@ -380,6 +384,7 @@ mml-secure-select-preferred-keys-1 - - (ert-deftest mml-secure-select-preferred-keys-2 () - "If multiple keys exists for an e-mail address, customization is necessary." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (test-conf)) - (mml-secure-test-fixture - (lambda () -@@ -407,6 +412,7 @@ mml-secure-select-preferred-keys-2 - - (ert-deftest mml-secure-select-preferred-keys-3 () - "Expired customized keys are removed if multiple keys are available." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (test-conf)) - (mml-secure-test-fixture - (lambda () -@@ -581,6 +587,7 @@ mml-secure-test-en-decrypt-with-passphrase - (ert-deftest mml-secure-en-decrypt-1 () - "Encrypt message; then decrypt and test for expected result. - In this test, the single matching key is chosen automatically." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (test-conf)) - (dolist (method (enc-standards) nil) - ;; no-exp@example.org with single encryption key -@@ -625,6 +632,7 @@ mml-secure-en-decrypt-3 - (ert-deftest mml-secure-en-decrypt-4 () - "Encrypt message; then decrypt and test for expected result. - In this test, encrypt-to-self variables are set to lists." -+ :tags (if (getenv "RPM_BUILD_ROOT") '(:unstable)) - (skip-unless (test-conf)) - ;; Send from sub@example.org, which has two keys; encrypt to both. - (let ((mml-secure-openpgp-encrypt-to-self --- -2.47.0 - diff --git a/0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch b/0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch deleted file mode 100644 index d7aa8fe..0000000 --- a/0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e0f0549ac6766ab565dbd581098b96792a807727 Mon Sep 17 00:00:00 2001 -From: Peter Oliver -Date: Wed, 17 Jul 2024 00:06:02 +0100 -Subject: [PATCH 4/4] Try harder to stabalise dired-test-bug27243-02 - -* test/lisp/dired-tests.el (dired-test-bug27243-02): Don't rely on the -expected point, since columns will move if the size of the parent directory -changes order of magnitude. ---- - test/lisp/dired-tests.el | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el -index ea47043dfc5..6078e99e13c 100644 ---- a/test/lisp/dired-tests.el -+++ b/test/lisp/dired-tests.el -@@ -190,7 +190,6 @@ dired-test-bug27243-02 - "Test for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27243#28 ." - (ert-with-temp-directory test-dir - (let ((dired-auto-revert-buffer t) -- (dired-free-space nil) - buffers) - ;; On MS-Windows, get rid of 8+3 short names in test-dir, if the - ;; corresponding long file names exist, otherwise such names trip -@@ -216,7 +215,9 @@ dired-test-bug27243-02 - ;; Sanity check: point should now be back on the subdirectory. - (should (eq (point) pt1)) - (push (dired test-dir) buffers) -- (should (eq (point) pt1))) -+ (should (equal (dired-file-name-at-point) -+ (concat (file-name-as-directory test-dir) -+ (file-name-as-directory "test-subdir"))))) - (dolist (buf buffers) - (when (buffer-live-p buf) (kill-buffer buf))))))) - --- -2.45.2 - diff --git a/emacs.spec b/emacs.spec index b9e173c..ed0c049 100644 --- a/emacs.spec +++ b/emacs.spec @@ -44,12 +44,6 @@ Patch: emacs-libdir-vs-systemd.patch Patch: emacs-desktop.patch Patch: emacs-pgtk-on-x-error-message.patch -# Fix intermittently failing test (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72120) -Patch: 0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch - -# Skip intermittently failing tests -Patch: 0003-Mark-multiple-mml-sec-tests-as-unstable-when-built-i.patch - # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2276822 # (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63555). If GDK ever # gets any new backends, this patch may need extending. @@ -619,32 +613,6 @@ export QA_SKIP_BUILD_ROOT=0 %check -# A number of tests that don't work on GNU EMBA are also unstable when -# run in Koji. -export EMACS_EMBA_CI=1 - -cd build-pgtk -%make_build check -cd .. - -%if %{with gtkx11} -cd build-gtk+x11 -%make_build check -cd .. -%endif - -%if %{with lucid} -cd build-lucid -%make_build check -cd .. -%endif - -%if %{with nw} -cd build-nw -%make_build check -cd .. -%endif - appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop