5 files changed, 172 insertions, 61 deletions

diff --git a/test/lisp/button-tests.el b/test/lisp/button-tests.el
new file mode 100644
index 00000000000..d54a992ab89
--- /dev/null
+++ b/test/lisp/button-tests.el
@@ -0,0 +1,40 @@
+;;; button-tests.el --- tests for button.el -*- lexical-binding: t -*-
+
+;; Copyright (C) 2019 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+
+(ert-deftest button-at ()
+  "Test `button-at' behavior."
+  (with-temp-buffer
+    (should-not (button-at (point)))
+    (let ((button (insert-text-button "text button"))
+          (marker (button-at (1- (point)))))
+      (should (markerp marker))
+      (should (= (button-end button) (button-end marker) (point))))
+    (let ((button  (insert-button "overlay button"))
+          (overlay (button-at (1- (point)))))
+      (should (overlayp overlay))
+      (should (eq button overlay)))
+    ;; Buttons and widgets are incompatible (bug#34506).
+    (widget-create 'link "link widget")
+    (should-not (button-at (1- (point))))))
+
+;;; button-tests.el ends here
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 1c7198ce560..5a9541db8fb 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3849,12 +3849,14 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
   "Check `start-file-process'."
   :tags '(:expensive-test)
   (skip-unless (tramp--test-enabled))
-  (skip-unless (tramp--test-sh-p))
+  (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
 
   (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil)))
     (let ((default-directory tramp-test-temporary-file-directory)
           (tmp-name (tramp--test-make-temp-name nil quoted))
           kill-buffer-query-functions proc)
+
+      ;; Simple process.
       (unwind-protect
           (with-temp-buffer
             (setq proc (start-file-process "test1" (current-buffer) "cat"))
@@ -3866,11 +3868,14 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (with-timeout (10 (tramp--test-timeout-handler))
               (while (< (- (point-max) (point-min)) (length "foo"))
                 (while (accept-process-output proc 0 nil t))))
-            (should (string-equal (buffer-string) "foo")))
+            ;; We cannot use `string-equal', because tramp-adb.el
+            ;; echoes also the sent string.
+            (should (string-match "\\`foo" (buffer-string))))
 
         ;; Cleanup.
         (ignore-errors (delete-process proc)))
 
+      ;; Simple process using a file.
       (unwind-protect
           (with-temp-buffer
             (write-region "foo" nil tmp-name)
@@ -3891,6 +3896,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
           (delete-process proc)
           (delete-file tmp-name)))
 
+      ;; Process filter.
       (unwind-protect
           (with-temp-buffer
             (setq proc (start-file-process "test3" (current-buffer) "cat"))
@@ -3905,7 +3911,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (with-timeout (10 (tramp--test-timeout-handler))
               (while (< (- (point-max) (point-min)) (length "foo"))
                 (while (accept-process-output proc 0 nil t))))
-            (should (string-equal (buffer-string) "foo")))
+            ;; We cannot use `string-equal', because tramp-adb.el
+            ;; echoes also the sent string.
+            (should (string-match "\\`foo" (buffer-string))))
 
         ;; Cleanup.
         (ignore-errors (delete-process proc))))))
@@ -3914,9 +3922,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
   "Check `make-process'."
   :tags '(:expensive-test)
   (skip-unless (tramp--test-enabled))
-  (skip-unless (tramp--test-sh-p))
+  (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
+  ;; `make-process' supports file name handlers since Emacs 27.
   (skip-unless (tramp--test-emacs27-p))
 
+  (tramp--test-instrument-test-case 0
   (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil)))
     (let ((default-directory tramp-test-temporary-file-directory)
           (tmp-name (tramp--test-make-temp-name nil quoted))
@@ -3938,7 +3948,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (with-timeout (10 (tramp--test-timeout-handler))
               (while (< (- (point-max) (point-min)) (length "foo"))
                 (while (accept-process-output proc 0 nil t))))
-            (should (string-equal (buffer-string) "foo")))
+            ;; We cannot use `string-equal', because tramp-adb.el
+            ;; echoes also the sent string.
+            (should (string-match "\\`foo" (buffer-string))))
 
         ;; Cleanup.
         (ignore-errors (delete-process proc)))
@@ -3981,9 +3993,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (process-send-eof proc)
             ;; Read output.
             (with-timeout (10 (tramp--test-timeout-handler))
-              (while (< (- (point-max) (point-min)) (length "foo"))
+              (while (not (string-match "foo" (buffer-string)))
                 (while (accept-process-output proc 0 nil t))))
-            (should (string-equal (buffer-string) "foo")))
+            ;; We cannot use `string-equal', because tramp-adb.el
+            ;; echoes also the sent string.
+            (should (string-match "\\`foo" (buffer-string))))
 
         ;; Cleanup.
         (ignore-errors (delete-process proc)))
@@ -4006,33 +4020,37 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             ;; Read output.
             (with-timeout (10 (tramp--test-timeout-handler))
               (while (accept-process-output proc 0 nil t)))
-            (should (string-equal (buffer-string) "killed\n")))
+            ;; We cannot use `string-equal', because tramp-adb.el
+            ;; echoes also the sent string.
+            (should (string-match "killed\n\\'" (buffer-string))))
 
         ;; Cleanup.
         (ignore-errors (delete-process proc)))
 
-      ;; Process with stderr.
-      (let ((stderr (generate-new-buffer (generate-new-buffer-name "stderr"))))
-        (unwind-protect
-            (with-temp-buffer
-              (setq proc
-                    (make-process
-                     :name "test5" :buffer (current-buffer)
-                     :command '("cat" "/")
-                     :stderr stderr
-                     :file-handler t))
-              (should (processp proc))
-              ;; Read stderr.
-              (with-current-buffer stderr
-                (with-timeout (10 (tramp--test-timeout-handler))
-                  (while (= (point-min) (point-max))
-                    (while (accept-process-output proc 0 nil t))))
-                (should
-                 (string-equal (buffer-string) "cat: /: Is a directory\n"))))
+      ;; Process with stderr.  tramp-adb.el doesn't support it (yet).
+      (unless (tramp--test-adb-p)
+        (let ((stderr
+               (generate-new-buffer (generate-new-buffer-name "stderr"))))
+          (unwind-protect
+              (with-temp-buffer
+                (setq proc
+                      (make-process
+                       :name "test5" :buffer (current-buffer)
+                       :command '("cat" "/")
+                       :stderr stderr
+                       :file-handler t))
+                (should (processp proc))
+                ;; Read stderr.
+                (with-current-buffer stderr
+                  (with-timeout (10 (tramp--test-timeout-handler))
+                    (while (= (point-min) (point-max))
+                      (while (accept-process-output proc 0 nil t))))
+                  (should
+                   (string-match "^cat:.* Is a directory" (buffer-string)))))
 
-          ;; Cleanup.
-          (ignore-errors (delete-process proc))
-          (ignore-errors (kill-buffer stderr)))))))
+            ;; Cleanup.
+            (ignore-errors (delete-process proc))
+            (ignore-errors (kill-buffer stderr)))))))))
 
 (ert-deftest tramp-test31-interrupt-process ()
   "Check `interrupt-process'."
@@ -4096,8 +4114,6 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
         ;; Cleanup.
         (ignore-errors (delete-file tmp-name)))
 
-      ;; tramp-adb.el is not fit yet for asynchronous processes.
-      (unless (tramp--test-adb-p)
       (unwind-protect
           (with-temp-buffer
             (write-region "foo" nil tmp-name)
@@ -4124,10 +4140,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
               (buffer-string))))
 
         ;; Cleanup.
-        (ignore-errors (delete-file tmp-name))))
+        (ignore-errors (delete-file tmp-name)))
 
-      ;; tramp-adb.el is not fit yet for asynchronous processes.
-      (unless (tramp--test-adb-p)
       (unwind-protect
           (with-temp-buffer
             (write-region "foo" nil tmp-name)
@@ -4155,7 +4169,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
               (buffer-string))))
 
         ;; Cleanup.
-        (ignore-errors (delete-file tmp-name)))))))
+        (ignore-errors (delete-file tmp-name))))))
 
 (defun tramp--test-shell-command-to-string-asynchronously (command)
   "Like `shell-command-to-string', but for asynchronous processes."
@@ -4350,11 +4364,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
 ;; The functions were introduced in Emacs 26.1.
 (ert-deftest tramp-test34-explicit-shell-file-name ()
   "Check that connection-local `explicit-shell-file-name' is set."
-  ;; The handling of connection-local variables has changed.  Test
-  ;; must be reworked.
-  :tags '(:expensive-test :unstable)
+  :tags '(:expensive-test)
   (skip-unless (tramp--test-enabled))
-  (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p)))
+  ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for
+  ;; remote processes in Emacs.  That doesn't work for tramp-adb.el.
+  (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p))
+                   (tramp--test-sh-p)))
   ;; Since Emacs 26.1.
   (skip-unless (and (fboundp 'connection-local-set-profile-variables)
                     (fboundp 'connection-local-set-profiles)))
@@ -4368,15 +4383,16 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
     (unwind-protect
         (progn
           ;; `shell-mode' would ruin our test, because it deletes all
-          ;; buffer local variables.
+          ;; buffer local variables.  Not needed in Emacs 27.1.
           (put 'explicit-shell-file-name 'permanent-local t)
-          ;; Declare connection-local variable `explicit-shell-file-name'.
+          ;; Declare connection-local variables `explicit-shell-file-name'
+          ;; and `explicit-sh-args'.
           (with-no-warnings
             (connection-local-set-profile-variables
              'remote-sh
              `((explicit-shell-file-name
                 . ,(if (tramp--test-adb-p) "/system/bin/sh" "/bin/sh"))
-               (explicit-sh-args . ("-i"))))
+               (explicit-sh-args . ("-c" "echo foo"))))
             (connection-local-set-profiles
              `(:application tramp
                :protocol ,(file-remote-p default-directory 'method)
@@ -4386,14 +4402,18 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
           (put 'explicit-shell-file-name 'safe-local-variable #'identity)
           (put 'explicit-sh-args 'safe-local-variable #'identity)
 
-          ;; Run interactive shell.  Since the default directory is
-          ;; remote, `explicit-shell-file-name' shall be set in order
-          ;; to avoid a question.
+          ;; Run `shell' interactively.  Since the default directory
+          ;; is remote, `explicit-shell-file-name' shall be set in
+          ;; order to avoid a question.  `explicit-sh-args' echoes the
+          ;; test data.
           (with-current-buffer (get-buffer-create "*shell*")
             (ignore-errors (kill-process (current-buffer)))
             (should-not explicit-shell-file-name)
             (call-interactively #'shell)
-            (should explicit-shell-file-name)))
+            (with-timeout (10)
+              (while (accept-process-output
+                      (get-buffer-process (current-buffer)) nil nil t)))
+            (should (string-match "^foo$" (buffer-string)))))
 
       ;; Cleanup.
       (put 'explicit-shell-file-name 'permanent-local nil)
@@ -5347,20 +5367,17 @@ process sentinels.  They shall not disturb each other."
   ;; we mark it as unstable.
   :tags '(:expensive-test :unstable)
   (skip-unless (tramp--test-enabled))
-  (skip-unless (tramp--test-sh-p))
-  ;; This test is sensible wrt to other running tests.  Let it work
-  ;; only if it is the only selected test.
-  ;; FIXME: There must be a better solution.
-  (skip-unless
-   (= 1 (length
-         (ert-select-tests (ert--stats-selector ert--current-run-stats) t))))
+  ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for
+  ;; remote processes in Emacs.  That doesn't work for tramp-adb.el.
+  (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p))
+                   (tramp--test-sh-p)))
 
   (with-timeout
       (tramp--test-asynchronous-requests-timeout (tramp--test-timeout-handler))
     (define-key special-event-map [sigusr1] #'tramp--test-timeout-handler)
     (let* (;; For the watchdog.
            (default-directory (expand-file-name temporary-file-directory))
-           (shell-file-name "/bin/sh")
+           (shell-file-name (if (tramp--test-adb-p) "/system/bin/sh" "/bin/sh"))
            (watchdog
             (start-process-shell-command
              "*watchdog*" nil
@@ -5460,7 +5477,7 @@ process sentinels.  They shall not disturb each other."
                     "Process filter %s %s %s" proc string (current-time-string))
                    (with-current-buffer (process-buffer proc)
                      (insert string))
-                   (unless (zerop (length string))
+                   (when (< (process-get proc 'bar) 2)
                      (dired-uncache (process-get proc 'foo))
                      (should (file-attributes (process-get proc 'foo))))))
                 ;; Add process sentinel.  It shall not perform remote
@@ -5513,7 +5530,12 @@ process sentinels.  They shall not disturb each other."
             (dolist (buf buffers)
               (with-current-buffer buf
                 (should
-                 (string-equal (format "%s\n%s\n" buf buf) (buffer-string)))))
+                 (string-equal
+                  ;; tramp-adb.el echoes, so we must add the three strings.
+                  (if (tramp--test-adb-p)
+                      (format "%s\n%s\n%s\n%s\n%s\n" buf buf buf buf buf)
+                    (format "%s\n%s\n" buf buf))
+                  (buffer-string)))))
             (should-not
              (directory-files
               tmp-name nil directory-files-no-dot-files-regexp)))
@@ -5714,11 +5736,9 @@ Since it unloads Tramp, it shall be the last test to run."
 ;;   do not work properly for `nextcloud'.
 ;; * Fix `tramp-test29-start-file-process' and
 ;;   `tramp-test30-make-process' on MS Windows (`process-send-eof'?).
-;; * Fix `tramp-test29-start-file-process',
-;;   `tramp-test30-make-process' and `tramp-test32-shell-command' for
-;;   `adb' (see comment in `tramp-adb-send-command').
-;; * Rework `tramp-test34-explicit-shell-file-name'.
-;; * Fix Bug#16928 in `tramp-test43-asynchronous-requests'.
+;; * Fix Bug#16928 in `tramp-test43-asynchronous-requests'.  Looks
+;;   like it is resolved now.  Remove `:unstable' tag?
+;; * Implement `tramp-test31-interrupt-process' for `adb'.
 
 (provide 'tramp-tests)
 ;;; tramp-tests.el ends here
diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 629cdf9a137..732193476dd 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -142,6 +142,8 @@ SEVERITY-PREDICATE is used to setup
 
 (ert-deftest different-diagnostic-types ()
   "Test GCC warning via function predicate."
+  ;; http://lists.gnu.org/archive/html/emacs-devel/2019-03/msg01043.html
+  :expected-result (if (getenv "EMACS_HYDRA_CI") :failed :passed)
   (skip-unless (and (executable-find "gcc")
                     (version<=
                      "5" (string-trim
diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
index 94c846ecb16..999cf8dc7a3 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -5345,13 +5345,23 @@ class SomeClass:
 (ert-deftest python-tests--python-nav-end-of-statement--infloop ()
   "Checks that `python-nav-end-of-statement' doesn't infloop in a
 buffer with overlapping strings."
+  ;; FIXME: The treatment of strings has changed in the mean time, and the
+  ;; test below now neither signals an error nor inf-loops.
+  ;; The description of the problem it's trying to catch is not clear enough
+  ;; to be able to see if the underlying problem is really fixed, sadly.
+  ;; E.g. I don't know what is meant by "overlap", really.
+  (skip-unless nil)
   (python-tests-with-temp-buffer "''' '\n''' ' '\n"
     (syntax-propertize (point-max))
     ;; Create a situation where strings nominally overlap.  This
     ;; shouldn't happen in practice, but apparently it can happen when
     ;; a package calls `syntax-ppss' in a narrowed buffer during JIT
     ;; lock.
+    ;; FIXME: 4-5 is the SPC right after the opening triple quotes: why
+    ;; put a string-fence syntax on it?
     (put-text-property 4 5 'syntax-table (string-to-syntax "|"))
+    ;; FIXME: 8-9 is the middle quote in the closing triple quotes:
+    ;; it shouldn't have any syntax-table property to remove anyway!
     (remove-text-properties 8 9 '(syntax-table nil))
     (goto-char 4)
     (setq-local syntax-propertize-function nil)
diff --git a/test/lisp/wid-edit-tests.el b/test/lisp/wid-edit-tests.el
new file mode 100644
index 00000000000..a4350e715ed
--- /dev/null
+++ b/test/lisp/wid-edit-tests.el
@@ -0,0 +1,39 @@
+;;; wid-edit-tests.el --- tests for wid-edit.el -*- lexical-binding: t -*-
+
+;; Copyright (C) 2019 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+(require 'wid-edit)
+
+(ert-deftest widget-at ()
+  "Test `widget-at' behavior."
+  (with-temp-buffer
+    (should-not (widget-at))
+    (let ((marco (widget-create 'link "link widget"))
+          (polo  (widget-at (1- (point)))))
+      (should (widgetp polo))
+      (should (eq marco polo)))
+    ;; Buttons and widgets are incompatible (bug#34506).
+    (insert-text-button "text button")
+    (should-not (widget-at (1- (point))))
+    (insert-button "overlay button")
+    (should-not (widget-at (1- (point))))))
+
+;;; wid-edit-tests.el ends here