From 05d53d88865d0287412c0f52a421cbf96a4d425d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 14 Apr 2019 19:53:38 +0200 Subject: [PATCH] Some rearragements for remote tests in filenotify-tests.el * test/lisp/filenotify-tests.el (file-notify--deftest-remote): Change argument list, EXPECTED is not needed. (file-notify-test07-many-events-remote) (file-notify-test09-watched-file-in-watched-dir-remote): Adapt declaration accordingly. --- test/lisp/filenotify-tests.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 842d66d7780..a40dc720786 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -261,13 +261,13 @@ This returns only for the local case and gfilenotify; otherwise it is nil. (gfile-monitor-name file-notify--test-desc))) (cdr (assq file-notify--test-desc file-notify--test-monitors)))))) -(defmacro file-notify--deftest-remote (test docstring &optional expected skip) - "Define ert `TEST-remote' for remote files." +(defmacro file-notify--deftest-remote (test docstring &optional unstable) + "Define ert `TEST-remote' for remote files. +If UNSTABLE is non-nil, the test is tagged as `:unstable'." (declare (indent 1)) `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () ,docstring - :expected-result (or ,expected :passed) - :tags ,(if skip ''(:expensive-test :unstable) ''(:expensive-test)) + :tags (if ,unstable '(:expensive-test :unstable) '(:expensive-test)) (let* ((temporary-file-directory file-notify-test-remote-temporary-file-directory) (ert-test (ert-get-test ',test)) @@ -1203,8 +1203,8 @@ delivered." ;; Unpredictable failures, eg https://hydra.nixos.org/build/86016286 (file-notify--deftest-remote file-notify-test07-many-events - "Check that events are not dropped for remote directories." - :passed (getenv "EMACS_HYDRA_CI")) + "Check that events are not dropped for remote directories." + (getenv "EMACS_HYDRA_CI")) (ert-deftest file-notify-test08-backup () "Check that backup keeps file notification." @@ -1421,8 +1421,8 @@ the file watch." ;; Cleanup. (file-notify--test-cleanup))) -;(file-notify--deftest-remote file-notify-test09-watched-file-in-watched-dir -; "Check `file-notify-test09-watched-file-in-watched-dir' for remote files.") +(file-notify--deftest-remote file-notify-test09-watched-file-in-watched-dir + "Check `file-notify-test09-watched-file-in-watched-dir' for remote files." t) (ert-deftest file-notify-test10-sufficient-resources () "Check that file notification does not use too many resources." -- 2.39.2