aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGlenn Morris2018-12-15 15:04:24 -0800
committerGlenn Morris2018-12-15 15:04:24 -0800
commitaca60820e16560cc84fe9e093030262f6c4cbd59 (patch)
tree9f26cbb02589804ec74369ce74ed02c09a6ece0f /test
parent34b4da377ae02a0c505574f5ca5f146e92cfd046 (diff)
downloademacs-aca60820e16560cc84fe9e093030262f6c4cbd59.tar.gz
emacs-aca60820e16560cc84fe9e093030262f6c4cbd59.zip
Suppress filenotify remote test failures on hydra.nixos.org
* test/lisp/filenotify-tests.el (file-notify--deftest-remote): Add optional argument to pass expected-result. (file-notify-test04-autorevert-remote) (file-notify-test08-backup-remote): Expect failure on hydra (bug#33735).
Diffstat (limited to 'test')
-rw-r--r--test/lisp/filenotify-tests.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 612ea8cd7f4..26b8276b8ec 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -240,12 +240,13 @@ This returns only for the local case and gfilenotify; otherwise it is nil.
240 (gfile-monitor-name file-notify--test-desc))) 240 (gfile-monitor-name file-notify--test-desc)))
241 (cdr (assq file-notify--test-desc file-notify--test-monitors)))))) 241 (cdr (assq file-notify--test-desc file-notify--test-monitors))))))
242 242
243(defmacro file-notify--deftest-remote (test docstring) 243(defmacro file-notify--deftest-remote (test docstring &optional expected)
244 "Define ert `TEST-remote' for remote files." 244 "Define ert `TEST-remote' for remote files."
245 (declare (indent 1)) 245 (declare (indent 1))
246 `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () 246 `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) ()
247 ,docstring 247 ,docstring
248 :tags '(:expensive-test) 248 :tags '(:expensive-test)
249 :expected-result (or ,expected :passed)
249 (let* ((temporary-file-directory 250 (let* ((temporary-file-directory
250 file-notify-test-remote-temporary-file-directory) 251 file-notify-test-remote-temporary-file-directory)
251 (ert-test (ert-get-test ',test))) 252 (ert-test (ert-get-test ',test)))
@@ -917,7 +918,8 @@ delivered."
917 (file-notify--test-cleanup)))) 918 (file-notify--test-cleanup))))
918 919
919(file-notify--deftest-remote file-notify-test04-autorevert 920(file-notify--deftest-remote file-notify-test04-autorevert
920 "Check autorevert via file notification for remote files.") 921 "Check autorevert via file notification for remote files."
922 (if (getenv "EMACS_HYDRA_CI") :failed :passed)) ; fixme bug#33735
921 923
922(ert-deftest file-notify-test05-file-validity () 924(ert-deftest file-notify-test05-file-validity ()
923 "Check `file-notify-valid-p' for files." 925 "Check `file-notify-valid-p' for files."
@@ -1239,7 +1241,8 @@ delivered."
1239 (file-notify--test-cleanup))) 1241 (file-notify--test-cleanup)))
1240 1242
1241(file-notify--deftest-remote file-notify-test08-backup 1243(file-notify--deftest-remote file-notify-test08-backup
1242 "Check that backup keeps file notification for remote files.") 1244 "Check that backup keeps file notification for remote files."
1245 (if (getenv "EMACS_HYDRA_CI") :failed :passed)) ; fixme bug#33735
1243 1246
1244(ert-deftest file-notify-test09-watched-file-in-watched-dir () 1247(ert-deftest file-notify-test09-watched-file-in-watched-dir ()
1245 "Watches a directory and a file in that directory separately. 1248 "Watches a directory and a file in that directory separately.