[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116052: Fix Bug#13662.
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] trunk r116052: Fix Bug#13662. |
Date: |
Fri, 17 Jan 2014 11:50:22 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116052
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2014-01-17 12:50:15 +0100
message:
Fix Bug#13662.
* automated/inotify-test.el (inotify-file-watch-simple): Skip test
case if inotify is not linked with Emacs. Use `read-event' rather
than `sit-for' in order to process events.
modified:
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/inotify-test.el
inotifytest.el-20121210111500-2cd7np2oq1r0lmp9-2
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2014-01-13 22:21:32 +0000
+++ b/test/ChangeLog 2014-01-17 11:50:15 +0000
@@ -1,3 +1,9 @@
+2014-01-17 Michael Albinus <address@hidden>
+
+ * automated/inotify-test.el (inotify-file-watch-simple): Skip test
+ case if inotify is not linked with Emacs. Use `read-event' rather
+ than `sit-for' in order to process events. (Bug#13662)
+
2014-01-13 Michael Albinus <address@hidden>
* automated/ert-tests.el (ert-test-record-backtrace): Reenable
=== modified file 'test/automated/inotify-test.el'
--- a/test/automated/inotify-test.el 2014-01-01 07:43:34 +0000
+++ b/test/automated/inotify-test.el 2014-01-17 11:50:15 +0000
@@ -28,37 +28,36 @@
(declare-function inotify-add-watch "inotify.c" (file-name aspect callback))
(declare-function inotify-rm-watch "inotify.c" (watch-descriptor))
-(when (featurep 'inotify)
-
- ;; (ert-deftest filewatch-file-watch-aspects-check ()
- ;; "Test whether `file-watch' properly checks the aspects."
- ;; (let ((temp-file (make-temp-file "filewatch-aspects")))
- ;; (should (stringp temp-file))
- ;; (should-error (file-watch temp-file 'wrong nil)
- ;; :type 'error)
- ;; (should-error (file-watch temp-file '(modify t) nil)
- ;; :type 'error)
- ;; (should-error (file-watch temp-file '(modify all-modify) nil)
- ;; :type 'error)
- ;; (should-error (file-watch temp-file '(access wrong modify) nil)
- ;; :type 'error)))
-
- (ert-deftest inotify-file-watch-simple ()
- "Test if watching a normal file works."
- (let ((temp-file (make-temp-file "inotify-simple"))
- (events 0))
- (let ((wd
- (inotify-add-watch temp-file t (lambda (_ev)
- (setq events (1+ events))))))
- (unwind-protect
- (progn
- (with-temp-file temp-file
- (insert "Foo\n"))
- (sit-for 5) ;; Hacky. Wait for 5s until events are processed
- (should (> events 0)))
- (inotify-rm-watch wd)
- (delete-file temp-file)))))
-)
+;; (ert-deftest filewatch-file-watch-aspects-check ()
+;; "Test whether `file-watch' properly checks the aspects."
+;; (let ((temp-file (make-temp-file "filewatch-aspects")))
+;; (should (stringp temp-file))
+;; (should-error (file-watch temp-file 'wrong nil)
+;; :type 'error)
+;; (should-error (file-watch temp-file '(modify t) nil)
+;; :type 'error)
+;; (should-error (file-watch temp-file '(modify all-modify) nil)
+;; :type 'error)
+;; (should-error (file-watch temp-file '(access wrong modify) nil)
+;; :type 'error)))
+
+(ert-deftest inotify-file-watch-simple ()
+ "Test if watching a normal file works."
+
+ (skip-unless (featurep 'inotify))
+ (let ((temp-file (make-temp-file "inotify-simple"))
+ (events 0))
+ (let ((wd
+ (inotify-add-watch temp-file t (lambda (_ev)
+ (setq events (1+ events))))))
+ (unwind-protect
+ (progn
+ (with-temp-file temp-file
+ (insert "Foo\n"))
+ (read-event nil nil 5)
+ (should (> events 0)))
+ (inotify-rm-watch wd)
+ (delete-file temp-file)))))
(provide 'inotify-tests)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116052: Fix Bug#13662.,
Michael Albinus <=