diff options
| author | Glenn Morris | 2018-12-18 23:21:37 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-12-18 23:21:37 -0800 |
| commit | dc3f70dc8f87a379cd418b96a5750765a27f8abd (patch) | |
| tree | 92ea1ebd3c63885406a2450592cd5dc0b2bb2dd9 | |
| parent | 70926a3e8671034fd5cb1a546f9c107feda729a3 (diff) | |
| download | emacs-dc3f70dc8f87a379cd418b96a5750765a27f8abd.tar.gz emacs-dc3f70dc8f87a379cd418b96a5750765a27f8abd.zip | |
Skip a remote filenotify test on hydra
* test/lisp/filenotify-tests.el (file-notify--deftest-remote):
Add optional argument to skip test.
(file-notify-test07-many-events-remote): Skip on hydra.nixos.org.
| -rw-r--r-- | test/lisp/filenotify-tests.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 48dd2de7d12..4c8e7fbe93a 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el | |||
| @@ -241,13 +241,14 @@ This returns only for the local case and gfilenotify; otherwise it is nil. | |||
| 241 | (gfile-monitor-name file-notify--test-desc))) | 241 | (gfile-monitor-name file-notify--test-desc))) |
| 242 | (cdr (assq file-notify--test-desc file-notify--test-monitors)))))) | 242 | (cdr (assq file-notify--test-desc file-notify--test-monitors)))))) |
| 243 | 243 | ||
| 244 | (defmacro file-notify--deftest-remote (test docstring &optional expected) | 244 | (defmacro file-notify--deftest-remote (test docstring &optional expected skip) |
| 245 | "Define ert `TEST-remote' for remote files." | 245 | "Define ert `TEST-remote' for remote files." |
| 246 | (declare (indent 1)) | 246 | (declare (indent 1)) |
| 247 | `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () | 247 | `(ert-deftest ,(intern (concat (symbol-name test) "-remote")) () |
| 248 | ,docstring | 248 | ,docstring |
| 249 | :tags '(:expensive-test) | 249 | :tags '(:expensive-test) |
| 250 | :expected-result (or ,expected :passed) | 250 | :expected-result (or ,expected :passed) |
| 251 | (skip-unless (not ,skip)) | ||
| 251 | (let* ((temporary-file-directory | 252 | (let* ((temporary-file-directory |
| 252 | file-notify-test-remote-temporary-file-directory) | 253 | file-notify-test-remote-temporary-file-directory) |
| 253 | (ert-test (ert-get-test ',test))) | 254 | (ert-test (ert-get-test ',test))) |
| @@ -1161,8 +1162,10 @@ delivered." | |||
| 1161 | ;; Cleanup. | 1162 | ;; Cleanup. |
| 1162 | (file-notify--test-cleanup))) | 1163 | (file-notify--test-cleanup))) |
| 1163 | 1164 | ||
| 1165 | ;; Unpredictable failures, eg https://hydra.nixos.org/build/86016286 | ||
| 1164 | (file-notify--deftest-remote file-notify-test07-many-events | 1166 | (file-notify--deftest-remote file-notify-test07-many-events |
| 1165 | "Check that events are not dropped for remote directories.") | 1167 | "Check that events are not dropped for remote directories." |
| 1168 | :passed (getenv "EMACS_HYDRA_CI")) | ||
| 1166 | 1169 | ||
| 1167 | (ert-deftest file-notify-test08-backup () | 1170 | (ert-deftest file-notify-test08-backup () |
| 1168 | "Check that backup keeps file notification." | 1171 | "Check that backup keeps file notification." |