From 88b7252ef15f1faf7478af130f94a64c25f741b9 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Jul 17 2024 11:45:35 +0000 Subject: More test stabilisation. --- 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 index dbf0668..579c1fe 100644 --- 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 @@ -1,18 +1,18 @@ -From 8d5348d6be9dadc9a98a66a70f08c995575deda1 Mon Sep 17 00:00:00 2001 +From 84174667ab624d16ba4c4f806d25e305ab919b80 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 15 Jul 2024 16:19:10 +0100 -Subject: [PATCH 3/3] Mark multiple mml-sec tests as unstable when built in an +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 | 4 ++++ - 1 file changed, 4 insertions(+) + test/lisp/gnus/mml-sec-tests.el | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el -index 7abd1bd65a3..f5a412cf2a4 100644 +index 7abd1bd65a3..a381ff8e94d 100644 --- a/test/lisp/gnus/mml-sec-tests.el +++ b/test/lisp/gnus/mml-sec-tests.el @@ -278,6 +278,7 @@ mml-secure-key-checks @@ -23,7 +23,15 @@ index 7abd1bd65a3..f5a412cf2a4 100644 (skip-unless (test-conf)) (mml-secure-test-fixture (lambda () -@@ -407,6 +408,7 @@ mml-secure-select-preferred-keys-2 +@@ -369,6 +370,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 () +@@ -407,6 +409,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." @@ -31,7 +39,7 @@ index 7abd1bd65a3..f5a412cf2a4 100644 (skip-unless (test-conf)) (mml-secure-test-fixture (lambda () -@@ -581,6 +583,7 @@ mml-secure-test-en-decrypt-with-passphrase +@@ -581,6 +584,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." @@ -39,7 +47,7 @@ index 7abd1bd65a3..f5a412cf2a4 100644 (skip-unless (test-conf)) (dolist (method (enc-standards) nil) ;; no-exp@example.org with single encryption key -@@ -625,6 +628,7 @@ mml-secure-en-decrypt-3 +@@ -625,6 +629,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." diff --git a/0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch b/0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch index 884f70f..d7aa8fe 100644 --- a/0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch +++ b/0004-Try-harder-to-stabalise-dired-test-bug27243-02.patch @@ -1,27 +1,38 @@ -From 456525d14a6778ab624f4e329627cb7adfb0d053 Mon Sep 17 00:00:00 2001 +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): Hide file -details, to prevent changes to the size or contents of the parent -directory from affecting the test. +* 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 | 1 + - 1 file changed, 1 insertion(+) + 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..6bfb2d56303 100644 +index ea47043dfc5..6078e99e13c 100644 --- a/test/lisp/dired-tests.el +++ b/test/lisp/dired-tests.el -@@ -198,6 +198,7 @@ dired-test-bug27243-02 - (if (eq system-type 'windows-nt) - (setq test-dir (file-truename test-dir))) - (with-current-buffer (find-file-noselect test-dir) -+ (dired-hide-details-mode) - (make-directory "test-subdir")) - (push (dired test-dir) buffers) - (unwind-protect +@@ -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