Merge commit '74e9799bd89484b8d15bdd6597c68fc00d07e7f7'

11 files changed, 367 insertions, 166 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index b7959072083..abcba944734 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -233,6 +233,7 @@ define test_template
   ifeq (,$(patsubst %-tests,,$(1))$(findstring -tests/,$(1)))
     $(1).log: $(patsubst %-tests,$(srcdir)/../%,$(1))$(if \
                                         $(patsubst src/%,,$(patsubst lib-src/%,,$(1))),.el,.c)
+    $(notdir $(1).log): $(1).log
   endif
 
   ## Short aliases that always re-run the tests, with no logging.
diff --git a/test/README b/test/README
index c34cdce8ef4..b55e24556f5 100644
--- a/test/README
+++ b/test/README
@@ -44,6 +44,9 @@ The Makefile in this directory supports the following targets:
   tests.  In the former case the output is shown on the terminal, in
   the latter case the output is written to <filename>.log.
 
+<filename> could be either a relative file name like
+"lisp/files-tests", or a package name like "files-tests".
+
 ERT offers selectors, which make it possible to filter out which test
 cases shall run.  The make variable $(SELECTOR) gives you a simple
 mean to use your own selectors.  The ERT manual describes how
diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el
index 0ff3c5a4071..0aec1800dfe 100644
--- a/test/lisp/autorevert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@ -277,6 +277,9 @@ This expects `auto-revert--messages' to be bound by
 ;  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
 
   (let ((tmpfile (make-temp-file "auto-revert-test"))
+        ;; Try to catch bug#32645.
+        (auto-revert-debug (getenv "EMACS_HYDRA_CI"))
+        (file-notify-debug (getenv "EMACS_HYDRA_CI"))
         buf desc)
     (unwind-protect
         (progn
diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el
index baea4804045..0d7004d7106 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -1300,6 +1300,24 @@ UID:9188710a-08a7-4061-bae3-d4cf4972599a
 "
 ))
 
+(ert-deftest icalendar-import-bug-33277 ()
+  ;;bug#33277 -- start time equals end time
+  (icalendar-tests--test-import
+   "DTSTART:20181105T200000Z
+DTSTAMP:20181105T181652Z
+DESCRIPTION:
+LAST-MODIFIED:20181105T181646Z
+LOCATION:
+SEQUENCE:0
+SUMMARY:event with same start/end time
+TRANSP:OPAQUE
+"
+
+   "&2018/11/5 21:00 event with same start/end time\n"
+   "&5/11/2018 21:00 event with same start/end time\n"
+   "&11/5/2018 21:00 event with same start/end time\n"
+   ))
+
 (ert-deftest icalendar-import-multiple-vcalendars ()
   (icalendar-tests--test-import
    "DTSTART;VALUE=DATE:20110723
diff --git a/test/lisp/net/nsm-tests.el b/test/lisp/net/nsm-tests.el
new file mode 100644
index 00000000000..bf6ac04b527
--- /dev/null
+++ b/test/lisp/net/nsm-tests.el
@@ -0,0 +1,69 @@
+;;; network-stream-tests.el --- tests for network security manager -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019 Free Software Foundation, Inc.
+
+;; Author: Robert Pluim <rpluim@gmail.com>
+
+;; 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/>.
+
+;;; Commentary:
+
+
+;;; Code:
+
+(require 'nsm)
+(eval-when-compile (require 'cl-lib))
+
+(ert-deftest nsm-check-local-subnet-ipv4 ()
+  "Check that nsm can be avoided for local subnets."
+  (let ((local-ip '[172 26 128 160 0])
+        (mask '[255 255 255 0 0])
+
+        (wrong-length-mask '[255 255 255])
+        (wrong-mask '[255 255 255 255 0])
+        (remote-ip-yes '[172 26 128 161 0])
+        (remote-ip-no '[172 26 129 161 0]))
+
+    (should (eq t (nsm-network-same-subnet local-ip mask remote-ip-yes)))
+    (should (eq nil (nsm-network-same-subnet local-ip mask remote-ip-no)))
+    (should-error (nsm-network-same-subnet local-ip wrong-length-mask remote-ip-yes))
+    (should (eq nil (nsm-network-same-subnet local-ip wrong-mask remote-ip-yes)))
+    (should (eq t (nsm-should-check "google.com")))
+    (should (eq t (nsm-should-check "127.1")))
+    (should (eq t (nsm-should-check "localhost")))
+    (let ((nsm-trust-local-network t))
+      (should (eq t (nsm-should-check "google.com")))
+      (should (eq nil (nsm-should-check "127.1")))
+      (should (eq nil (nsm-should-check "localhost"))))))
+
+;; FIXME This will never return true, since
+;; network-interface-list only gives the primary address of each
+;; interface, which will be the IPv4 one
+(defun nsm-ipv6-is-available ()
+  (and (featurep 'make-network-process '(:family ipv6))
+       (cl-rassoc-if
+        (lambda (elt)
+          (eq 9 (length elt)))
+        (network-interface-list))))
+
+(ert-deftest nsm-check-local-subnet-ipv6 ()
+  (skip-unless (nsm-ipv6-is-available))
+  (should (eq t (nsm-should-check "::1")))
+  (let ((nsm-trust-local-network t))
+    (should (eq nil (nsm-should-check "::1")))))
+
+
+;;; nsm-tests.el ends here
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 180f746c647..dd6b9edd000 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3098,6 +3098,12 @@ They might differ only in time attributes or directory size."
   (let ((attr1 (copy-sequence attr1))
         (attr2 (copy-sequence attr2))
         (start-time (- tramp--test-start-time 10)))
+    ;; Link number.  For directories, it includes the number of
+    ;; subdirectories.  Set it to 1.
+    (when (eq (tramp-compat-file-attribute-type attr1) t)
+      (setcar (nthcdr 1 attr1) 1))
+    (when (eq (tramp-compat-file-attribute-type attr2) t)
+      (setcar (nthcdr 1 attr2) 1))
     ;; Access time.
     (setcar (nthcdr 4 attr1) tramp-time-dont-know)
     (setcar (nthcdr 4 attr2) tramp-time-dont-know)
@@ -3473,7 +3479,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
                 (setq tmp-name3 (concat (file-remote-p tmp-name3) tmp-name2)))))
 
         ;; Cleanup.
-        (ignore-errors (delete-directory tmp-name1 'recursive)))
+        (ignore-errors
+          (delete-file tmp-name3)
+          (delete-directory tmp-name1 'recursive)))
 
       ;; Detect cyclic symbolic links.
       (unwind-protect
@@ -3533,9 +3541,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
                       (file-attributes tmp-name1))
                      tramp-time-dont-know)
               (should
-               (equal (tramp-compat-file-attribute-modification-time
-                       (file-attributes tmp-name1))
-                      (seconds-to-time 1)))
+               (tramp-compat-time-equal-p
+                (tramp-compat-file-attribute-modification-time
+                 (file-attributes tmp-name1))
+                (seconds-to-time 1)))
               (write-region "bla" nil tmp-name2)
               (should (file-exists-p tmp-name2))
               (should (file-newer-than-file-p tmp-name2 tmp-name1))
@@ -4182,8 +4191,9 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (with-timeout (10 (tramp--test-timeout-handler))
               (while (accept-process-output proc 0 nil t)))
             ;; We cannot use `string-equal', because tramp-adb.el
-            ;; echoes also the sent string.
-            (should (string-match "killed\n\\'" (buffer-string))))
+            ;; echoes also the sent string.  And a remote macOS sends
+            ;; a slightly modified string.
+            (should (string-match "killed.*\n\\'" (buffer-string))))
 
         ;; Cleanup.
         (ignore-errors (delete-process proc)))
@@ -5145,7 +5155,8 @@ This requires restrictions of file name syntax."
            (tmp-name1 (tramp--test-make-temp-name nil quoted))
            (tmp-name2 (tramp--test-make-temp-name 'local quoted))
            (files (delq nil files))
-           (process-environment process-environment))
+           (process-environment process-environment)
+           (sorted-files (sort (copy-sequence files) #'string-lessp)))
       (unwind-protect
           (progn
             (make-directory tmp-name1)
@@ -5192,10 +5203,20 @@ This requires restrictions of file name syntax."
             ;; Check file names.
             (should (equal (directory-files
                             tmp-name1 nil directory-files-no-dot-files-regexp)
-                           (sort (copy-sequence files) #'string-lessp)))
+                           sorted-files))
             (should (equal (directory-files
                             tmp-name2 nil directory-files-no-dot-files-regexp)
-                           (sort (copy-sequence files) #'string-lessp)))
+                           sorted-files))
+            (should (equal (mapcar
+                            #'car
+                            (directory-files-and-attributes
+                             tmp-name1 nil directory-files-no-dot-files-regexp))
+                           sorted-files))
+            (should (equal (mapcar
+                            #'car
+                            (directory-files-and-attributes
+                             tmp-name2 nil directory-files-no-dot-files-regexp))
+                           sorted-files))
 
             ;; `substitute-in-file-name' could return different
             ;; values.  For `adb', there could be strange file
@@ -5268,7 +5289,10 @@ This requires restrictions of file name syntax."
                 (should-not (file-exists-p file1))))
 
             ;; Check, that environment variables are set correctly.
-            (when (and (tramp--test-expensive-test) (tramp--test-sh-p))
+            ;; We do not run on macOS due to encoding problems.  See
+            ;; Bug#36940.
+            (when (and (tramp--test-expensive-test) (tramp--test-sh-p)
+                       (not (eq system-type 'darwin)))
               (dolist (elt files)
                 (let ((envvar (concat "VAR_" (upcase (md5 elt))))
                       (elt (encode-coding-string elt coding-system-for-read))
diff --git a/test/lisp/shadowfile-tests.el b/test/lisp/shadowfile-tests.el
index 2a777af4720..a93664f6536 100644
--- a/test/lisp/shadowfile-tests.el
+++ b/test/lisp/shadowfile-tests.el
@@ -64,6 +64,7 @@
   "Temporary directory for Tramp tests.")
 
 (setq password-cache-expiry nil
+      shadow-debug t
       tramp-verbose 0
       tramp-message-show-message nil)
 
@@ -79,6 +80,35 @@
   (expand-file-name "shadow_todo_test" temporary-file-directory)
   "File to store the list of uncopied shadows in during tests.")
 
+(defun shadow--tests-cleanup ()
+  "Reset all `shadowfile' internals."
+  ;; Delete auto-saved files.
+  (with-current-buffer (find-file-noselect shadow-info-file 'nowarn)
+    (ignore-errors (delete-file (make-auto-save-file-name)))
+    (set-buffer-modified-p nil)
+    (kill-buffer))
+  (with-current-buffer (find-file-noselect shadow-todo-file 'nowarn)
+    (ignore-errors (delete-file (make-auto-save-file-name)))
+    (set-buffer-modified-p nil)
+    (kill-buffer))
+  ;; Delete buffers.
+  (ignore-errors
+    (with-current-buffer shadow-info-buffer
+      (set-buffer-modified-p nil)
+      (kill-buffer)))
+  (ignore-errors
+    (with-current-buffer shadow-todo-buffer
+      (set-buffer-modified-p nil)
+      (kill-buffer)))
+  ;; Delete files.
+  (ignore-errors (delete-file shadow-info-file))
+  (ignore-errors (delete-file shadow-todo-file))
+  ;; Reset variables.
+  (setq shadow-info-buffer nil
+        shadow-hashtable nil
+        shadow-todo-buffer nil
+        shadow-files-to-copy nil))
+
 (ert-deftest shadow-test00-clusters ()
   "Check cluster definitions.
 Per definition, all files are identical on the different hosts of
@@ -96,23 +126,21 @@ guaranteed by the originator of a cluster definition."
     (unwind-protect
         ;; We must mock `read-from-minibuffer' and `read-string', in
         ;; order to avoid interactive arguments.
-        (cl-letf* (((symbol-function 'read-from-minibuffer)
+        (cl-letf* (((symbol-function #'read-from-minibuffer)
                     (lambda (&rest args) (pop mocked-input)))
-                   ((symbol-function 'read-string)
+                   ((symbol-function #'read-string)
                     (lambda (&rest args) (pop mocked-input))))
 
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define a cluster.
           (setq cluster "cluster"
                 primary shadow-system-name
                 regexp (shadow-regexp-superquote primary)
                 mocked-input `(,cluster ,primary ,regexp))
-          (call-interactively 'shadow-define-cluster)
+          (call-interactively #'shadow-define-cluster)
           (should
            (string-equal
             (shadow-cluster-name (shadow-get-cluster cluster)) cluster))
@@ -136,7 +164,7 @@ guaranteed by the originator of a cluster definition."
                 mocked-input `(,cluster ,cluster ,primary ,regexp))
           (with-current-buffer (messages-buffer)
             (narrow-to-region (point-max) (point-max)))
-          (call-interactively 'shadow-define-cluster)
+          (call-interactively #'shadow-define-cluster)
           (should
            (string-match
             (regexp-quote "Not a valid primary!")
@@ -157,7 +185,7 @@ guaranteed by the originator of a cluster definition."
                 mocked-input `(,cluster ,primary ,cluster ,regexp))
           (with-current-buffer (messages-buffer)
             (narrow-to-region (point-max) (point-max)))
-          (call-interactively 'shadow-define-cluster)
+          (call-interactively #'shadow-define-cluster)
           (should
            (string-match
             (regexp-quote "Regexp doesn't include the primary host!")
@@ -178,7 +206,7 @@ guaranteed by the originator of a cluster definition."
                 (file-remote-p shadow-test-remote-temporary-file-directory)
                 regexp (shadow-regexp-superquote primary)
                 mocked-input `(,cluster ,primary ,regexp))
-          (call-interactively 'shadow-define-cluster)
+          (call-interactively #'shadow-define-cluster)
           (should
            (string-equal
             (shadow-cluster-name (shadow-get-cluster cluster)) cluster))
@@ -198,10 +226,7 @@ guaranteed by the originator of a cluster definition."
 
       ;; Cleanup.
       (with-current-buffer (messages-buffer) (widen))
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file)))))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test01-sites ()
   "Check site definitions.
@@ -218,16 +243,14 @@ guaranteed by the originator of a cluster definition."
     (unwind-protect
         ;; We must mock `read-from-minibuffer' and `read-string', in
         ;; order to avoid interactive arguments.
-        (cl-letf* (((symbol-function 'read-from-minibuffer)
+        (cl-letf* (((symbol-function #'read-from-minibuffer)
                     (lambda (&rest args) (pop mocked-input)))
-                   ((symbol-function 'read-string)
+                   ((symbol-function #'read-string)
                     (lambda (&rest args) (pop mocked-input))))
 
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define a cluster.
           (setq cluster1 "cluster1"
@@ -308,10 +331,7 @@ guaranteed by the originator of a cluster definition."
            (shadow-site-match (shadow-site-primary cluster1) cluster2)))
 
       ;; Cleanup.
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file)))))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test02-files ()
   "Check file manipulation functions."
@@ -324,11 +344,10 @@ guaranteed by the originator of a cluster definition."
         cluster primary regexp file hup)
     (unwind-protect
         (progn
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define a cluster.
           (setq cluster "cluster"
@@ -384,10 +403,7 @@ guaranteed by the originator of a cluster definition."
           (should-not (shadow-local-file nil)))
 
       ;; Cleanup.
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file)))))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test03-expand-cluster-in-file-name ()
   "Check canonical file name of a cluster or site."
@@ -400,11 +416,10 @@ guaranteed by the originator of a cluster definition."
         cluster primary regexp file1 file2)
     (unwind-protect
         (progn
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define a cluster.
           (setq cluster "cluster"
@@ -455,10 +470,7 @@ guaranteed by the originator of a cluster definition."
             (concat primary file1))))
 
       ;; Cleanup.
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file)))))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test04-contract-file-name ()
   "Check canonical file name of a cluster or site."
@@ -471,11 +483,10 @@ guaranteed by the originator of a cluster definition."
         cluster primary regexp file)
     (unwind-protect
         (progn
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define a cluster.
           (setq cluster "cluster"
@@ -516,10 +527,7 @@ guaranteed by the originator of a cluster definition."
             (concat "/cluster:" file))))
 
       ;; Cleanup.
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file)))))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test05-file-match ()
   "Check `shadow-same-site' and `shadow-file-match'."
@@ -532,11 +540,10 @@ guaranteed by the originator of a cluster definition."
         cluster primary regexp file)
     (unwind-protect
         (progn
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define a cluster.
           (setq cluster "cluster"
@@ -575,10 +582,7 @@ guaranteed by the originator of a cluster definition."
             file)))
 
       ;; Cleanup.
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file)))))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test06-literal-groups ()
   "Check literal group definitions."
@@ -592,16 +596,14 @@ guaranteed by the originator of a cluster definition."
     (unwind-protect
         ;; We must mock `read-from-minibuffer' and `read-string', in
         ;; order to avoid interactive arguments.
-        (cl-letf* (((symbol-function 'read-from-minibuffer)
+        (cl-letf* (((symbol-function #'read-from-minibuffer)
                     (lambda (&rest args) (pop mocked-input)))
-                   ((symbol-function 'read-string)
+                   ((symbol-function #'read-string)
                     (lambda (&rest args) (pop mocked-input))))
 
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define clusters.
           (setq cluster1 "cluster1"
@@ -627,7 +629,8 @@ guaranteed by the originator of a cluster definition."
                 mocked-input `(,cluster1 ,file1 ,cluster2 ,file2 ,(kbd "RET")))
           (with-temp-buffer
             (set-visited-file-name file1)
-            (call-interactively 'shadow-define-literal-group))
+            (call-interactively #'shadow-define-literal-group)
+            (set-buffer-modified-p nil))
 
           ;; `shadow-literal-groups' is a list of lists.
           (should (consp shadow-literal-groups))
@@ -640,10 +643,7 @@ guaranteed by the originator of a cluster definition."
                           (car shadow-literal-groups))))
 
       ;; Cleanup.
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file)))))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test07-regexp-groups ()
   "Check regexp group definitions."
@@ -657,16 +657,14 @@ guaranteed by the originator of a cluster definition."
     (unwind-protect
         ;; We must mock `read-from-minibuffer' and `read-string', in
         ;; order to avoid interactive arguments.
-        (cl-letf* (((symbol-function 'read-from-minibuffer)
+        (cl-letf* (((symbol-function #'read-from-minibuffer)
                     (lambda (&rest args) (pop mocked-input)))
-                   ((symbol-function 'read-string)
+                   ((symbol-function #'read-string)
                     (lambda (&rest args) (pop mocked-input))))
 
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define clusters.
           (setq cluster1 "cluster1"
@@ -688,7 +686,8 @@ guaranteed by the originator of a cluster definition."
                                ,cluster1 ,cluster2 ,(kbd "RET")))
           (with-temp-buffer
             (set-visited-file-name nil)
-            (call-interactively 'shadow-define-regexp-group))
+            (call-interactively #'shadow-define-regexp-group)
+            (set-buffer-modified-p nil))
 
           ;; `shadow-regexp-groups' is a list of lists.
           (should (consp shadow-regexp-groups))
@@ -707,10 +706,7 @@ guaranteed by the originator of a cluster definition."
             (car shadow-regexp-groups))))
 
       ;; Cleanup.
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file)))))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test08-shadow-todo ()
   "Check that needed shadows are added to todo."
@@ -722,28 +718,37 @@ guaranteed by the originator of a cluster definition."
         (shadow-info-file shadow-test-info-file)
         (shadow-todo-file shadow-test-todo-file)
         (shadow-inhibit-message t)
+        (shadow-test-remote-temporary-file-directory
+         (file-truename shadow-test-remote-temporary-file-directory))
         shadow-clusters shadow-literal-groups shadow-regexp-groups
         shadow-files-to-copy
         cluster1 cluster2 primary regexp file)
     (unwind-protect
         (progn
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
+
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define clusters.
           (setq cluster1 "cluster1"
                 primary shadow-system-name
                 regexp (shadow-regexp-superquote primary))
           (shadow-set-cluster cluster1 primary regexp)
+          (when shadow-debug
+            (message
+             "shadow-test08-shadow-todo: %s %s %s %s"
+             cluster1 primary regexp shadow-clusters))
 
           (setq cluster2 "cluster2"
                 primary
                 (file-remote-p shadow-test-remote-temporary-file-directory)
                 regexp (shadow-regexp-superquote primary))
           (shadow-set-cluster cluster2 primary regexp)
+          (when shadow-debug
+            (message
+             "shadow-test08-shadow-todo: %s %s %s %s"
+             cluster2 primary regexp shadow-clusters))
 
           ;; Define a literal group.
           (setq file
@@ -751,12 +756,20 @@ guaranteed by the originator of a cluster definition."
                  (expand-file-name "shadowfile-tests" temporary-file-directory))
                 shadow-literal-groups
                 `((,(concat "/cluster1:" file) ,(concat "/cluster2:" file))))
+          (when shadow-debug
+            (message
+             "shadow-test08-shadow-todo: %s %s" file shadow-literal-groups))
 
           ;; Save file from "cluster1" definition.
           (with-temp-buffer
             (set-visited-file-name file)
             (insert "foo")
             (save-buffer))
+          (when shadow-debug
+            (message
+             "shadow-test08-shadow-todo: %s %s"
+             (cons file (shadow-contract-file-name (concat "/cluster2:" file)))
+             shadow-files-to-copy))
           (should
            (member
             (cons file (shadow-contract-file-name (concat "/cluster2:" file)))
@@ -767,6 +780,13 @@ guaranteed by the originator of a cluster definition."
             (set-visited-file-name (concat (shadow-site-primary cluster2) file))
             (insert "foo")
             (save-buffer))
+          (when shadow-debug
+            (message
+             "shadow-test08-shadow-todo: %s %s"
+             (cons
+              (concat (shadow-site-primary cluster2) file)
+              (shadow-contract-file-name (concat "/cluster1:" file)))
+             shadow-files-to-copy))
           (should
            (member
             (cons
@@ -781,12 +801,20 @@ guaranteed by the originator of a cluster definition."
                             (shadow-regexp-superquote file))
                    ,(concat (shadow-site-primary cluster2)
                             (shadow-regexp-superquote file)))))
+          (when shadow-debug
+            (message
+             "shadow-test08-shadow-todo: %s %s" file shadow-regexp-groups))
 
           ;; Save file from "cluster1" definition.
           (with-temp-buffer
             (set-visited-file-name file)
             (insert "foo")
             (save-buffer))
+          (when shadow-debug
+            (message
+             "shadow-test08-shadow-todo: %s %s"
+             (cons file (shadow-contract-file-name (concat "/cluster2:" file)))
+             shadow-files-to-copy))
           (should
            (member
             (cons file (shadow-contract-file-name (concat "/cluster2:" file)))
@@ -797,6 +825,13 @@ guaranteed by the originator of a cluster definition."
             (set-visited-file-name (concat (shadow-site-primary cluster2) file))
             (insert "foo")
             (save-buffer))
+          (when shadow-debug
+            (message
+             "shadow-test08-shadow-todo: %s %s"
+             (cons
+              (concat (shadow-site-primary cluster2) file)
+              (shadow-contract-file-name (concat "/cluster1:" file)))
+             shadow-files-to-copy))
           (should
            (member
             (cons
@@ -805,16 +840,13 @@ guaranteed by the originator of a cluster definition."
             shadow-files-to-copy)))
 
       ;; Cleanup.
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file))
-      (ignore-errors
-        (when (file-exists-p file)
-          (delete-file file)))
-      (ignore-errors
-        (when (file-exists-p (concat (shadow-site-primary cluster2) file))
-          (delete-file (concat (shadow-site-primary cluster2) file)))))))
+      (dolist (elt `(,file ,(concat (shadow-site-primary cluster2) file)))
+        (ignore-errors
+          (with-current-buffer (get-file-buffer elt)
+            (set-buffer-modified-p nil)
+            (kill-buffer)))
+        (ignore-errors (delete-file elt)))
+      (shadow--tests-cleanup))))
 
 (ert-deftest shadow-test09-shadow-copy-files ()
   "Check that needed shadow files are copied."
@@ -826,18 +858,17 @@ guaranteed by the originator of a cluster definition."
         (shadow-info-file shadow-test-info-file)
         (shadow-todo-file shadow-test-todo-file)
         (shadow-inhibit-message t)
+        (shadow-test-remote-temporary-file-directory
+         (file-truename shadow-test-remote-temporary-file-directory))
         (shadow-noquery t)
         shadow-clusters shadow-files-to-copy
         cluster1 cluster2 primary regexp file mocked-input)
     (unwind-protect
         (progn
-          ;; Cleanup.
-          (when (file-exists-p shadow-info-file)
-            (delete-file shadow-info-file))
-          (when (file-exists-p shadow-todo-file)
-            (delete-file shadow-todo-file))
-          (when (buffer-live-p shadow-todo-buffer)
-            (with-current-buffer shadow-todo-buffer (erase-buffer)))
+
+          ;; Cleanup & initialize.
+          (shadow--tests-cleanup)
+          (shadow-initialize)
 
           ;; Define clusters.
           (setq cluster1 "cluster1"
@@ -878,7 +909,7 @@ guaranteed by the originator of a cluster definition."
           ;; We must mock `write-region', in order to check proper
           ;; action.
           (add-function
-           :before (symbol-function 'write-region)
+           :before (symbol-function #'write-region)
            (lambda (&rest args)
              (when (and (buffer-file-name) mocked-input)
                (should (equal (buffer-file-name) (pop mocked-input)))))
@@ -893,17 +924,14 @@ guaranteed by the originator of a cluster definition."
              (looking-at (regexp-quote "(setq shadow-files-to-copy nil)")))))
 
       ;; Cleanup.
-      (remove-function (symbol-function 'write-region) "write-region-mock")
-      (when (file-exists-p shadow-info-file)
-        (delete-file shadow-info-file))
-      (when (file-exists-p shadow-todo-file)
-        (delete-file shadow-todo-file))
-      (ignore-errors
-        (when (file-exists-p file)
-          (delete-file file)))
-      (ignore-errors
-        (when (file-exists-p (concat (shadow-site-primary cluster2) file))
-          (delete-file (concat (shadow-site-primary cluster2) file)))))))
+      (remove-function (symbol-function #'write-region) "write-region-mock")
+      (dolist (elt `(,file ,(concat (shadow-site-primary cluster2) file)))
+        (ignore-errors
+          (with-current-buffer (get-file-buffer elt)
+            (set-buffer-modified-p nil)
+            (kill-buffer)))
+        (ignore-errors (delete-file elt)))
+      (shadow--tests-cleanup))))
 
 (defun shadowfile-test-all (&optional interactive)
   "Run all tests for \\[shadowfile]."
@@ -912,9 +940,5 @@ guaranteed by the originator of a cluster definition."
       (ert-run-tests-interactively "^shadowfile-")
     (ert-run-tests-batch "^shadowfile-")))
 
-(let ((shadow-info-file shadow-test-info-file)
-      (shadow-todo-file shadow-test-todo-file))
-  (shadow-initialize))
-
 (provide 'shadowfile-tests)
 ;;; shadowfile-tests.el ends here
diff --git a/test/src/data-tests.el b/test/src/data-tests.el
index a9d48e29a8a..3a7462b6ada 100644
--- a/test/src/data-tests.el
+++ b/test/src/data-tests.el
@@ -653,6 +653,13 @@ comparing the subr with a much slower lisp implementation."
     (data-tests-check-sign (% -1 -3) (% nb1 nb3))
     (data-tests-check-sign (mod -1 -3) (mod nb1 nb3))))
 
+(ert-deftest data-tests-mod-0 ()
+  (dolist (num (list (1- most-negative-fixnum) -1 0 1
+                     (1+ most-positive-fixnum)))
+    (should-error (mod num 0)))
+  (when (ignore-errors (/ 0.0 0))
+    (should (equal (abs (mod 0.0 0)) (abs (- 0.0 (/ 0.0 0)))))))
+
 (ert-deftest data-tests-ash-lsh ()
   (should (= (ash most-negative-fixnum 1)
              (* most-negative-fixnum 2)))
diff --git a/test/src/lread-tests.el b/test/src/lread-tests.el
index 82b75b195ca..ba5bfe0145d 100644
--- a/test/src/lread-tests.el
+++ b/test/src/lread-tests.el
@@ -220,4 +220,7 @@ literals (Bug#20852)."
                    (* most-positive-fixnum most-positive-fixnum)))
     (should (= n (string-to-number (format "%d." n))))))
 
+(ert-deftest lread-circular-hash ()
+  (should-error (read "#s(hash-table data #0=(#0# . #0#))")))
+
 ;;; lread-tests.el ends here
diff --git a/test/src/process-tests.el b/test/src/process-tests.el
index 7745fccaf9d..158c036aaa7 100644
--- a/test/src/process-tests.el
+++ b/test/src/process-tests.el
@@ -22,6 +22,7 @@
 ;;; Code:
 
 (require 'ert)
+(require 'puny)
 
 ;; Timeout in seconds; the test fails if the timeout is reached.
 (defvar process-test-sentinel-wait-timeout 2.0)
@@ -154,24 +155,30 @@
                   (concat invocation-directory invocation-name)
                   "-Q" "--batch" "--eval"
                   (prin1-to-string
-                   '(let (s)
-                      (while (setq s (read-from-minibuffer "$ "))
+                   '(let ((s nil) (count 0))
+                      (while (setq s (read-from-minibuffer
+                                      (format "%d> " count)))
                         (princ s)
-                        (princ "\n")))))))
+                        (princ "\n")
+                        (setq count (1+ count))))))))
       (set-process-query-on-exit-flag proc nil)
       (send-string proc "one\n")
-      (should
-       (accept-process-output proc 1))  ; Read "one".
-      (should (equal (buffer-string) "$ one\n$ "))
+      (while (not (equal (buffer-substring
+                          (line-beginning-position) (point-max))
+                         "1> "))
+        (accept-process-output proc))   ; Read "one".
+      (should (equal (buffer-string) "0> one\n1> "))
       (set-process-filter proc t)       ; Stop reading from proc.
       (send-string proc "two\n")
       (should-not
        (accept-process-output proc 1))  ; Can't read "two" yet.
-      (should (equal (buffer-string) "$ one\n$ "))
+      (should (equal (buffer-string) "0> one\n1> "))
       (set-process-filter proc nil)     ; Resume reading from proc.
-      (should
-       (accept-process-output proc 1))  ; Read "two" from proc.
-      (should (equal (buffer-string) "$ one\n$ two\n$ ")))))
+      (while (not (equal (buffer-substring
+                          (line-beginning-position) (point-max))
+                         "2> "))
+        (accept-process-output proc))   ; Read "Two".
+      (should (equal (buffer-string) "0> one\n1> two\n2> ")))))
 
 (ert-deftest start-process-should-not-modify-arguments ()
   "`start-process' must not modify its arguments in-place."
@@ -322,5 +329,41 @@ See Bug#30460."
                                                   invocation-directory))
                  :stop t)))
 
+;; All the following tests require working DNS, which appears not to
+;; be the case for hydra.nixos.org, so disable them there for now.
+
+(ert-deftest lookup-family-specification ()
+  "network-lookup-address-info should only accept valid family symbols."
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
+  (should-error (network-lookup-address-info "google.com" 'both))
+  (should (network-lookup-address-info "google.com" 'ipv4))
+  (should (network-lookup-address-info "google.com" 'ipv6)))
+
+(ert-deftest lookup-unicode-domains ()
+  "Unicode domains should fail"
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
+  (should-error (network-lookup-address-info "faß.de"))
+  (should (network-lookup-address-info (puny-encode-domain "faß.de"))))
+
+(ert-deftest unibyte-domain-name ()
+  "Unibyte domain names should work"
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
+  (should (network-lookup-address-info (string-to-unibyte "google.com"))))
+
+(ert-deftest lookup-google ()
+  "Check that we can look up google IP addresses"
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
+  (let ((addresses-both (network-lookup-address-info "google.com"))
+        (addresses-v4 (network-lookup-address-info "google.com" 'ipv4))
+        (addresses-v6 (network-lookup-address-info "google.com" 'ipv6)))
+    (should addresses-both)
+    (should addresses-v4)
+    (should addresses-v6)))
+
+(ert-deftest non-existent-lookup-failure ()
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
+  "Check that looking up non-existent domain returns nil"
+  (should (eq nil (network-lookup-address-info "emacs.invalid"))))
+
 (provide 'process-tests)
 ;; process-tests.el ends here.
diff --git a/test/src/timefns-tests.el b/test/src/timefns-tests.el
index a30b2de3a5b..3a18a4a24dd 100644
--- a/test/src/timefns-tests.el
+++ b/test/src/timefns-tests.el
@@ -19,6 +19,12 @@
 
 (require 'ert)
 
+(defun timefns-tests--decode-time (look zone decoded-time)
+  (should (equal (decode-time look zone t) decoded-time))
+  (should (equal (decode-time look zone 'integer)
+                 (cons (time-convert (car decoded-time) 'integer)
+                       (cdr decoded-time)))))
+
 ;;; Check format-time-string and decode-time with various TZ settings.
 ;;; Use only POSIX-compatible TZ values, since the tests should work
 ;;; even if tzdb is not in use.
@@ -40,31 +46,29 @@
                     (7879679999900 . 100000)
                     (78796799999999999999 . 1000000000000)))
       ;; UTC.
-     (let ((sec (time-add 59 (time-subtract (time-convert look t)
-                                            (time-convert look 'integer)))))
+     (let* ((look-ticks-hz (time-convert look t))
+            (hz (cdr look-ticks-hz))
+            (look-integer (time-convert look 'integer))
+            (sec (time-add (time-convert 59 hz)
+                           (time-subtract look-ticks-hz
+                                          (time-convert look-integer hz)))))
       (should (string-equal
                (format-time-string "%Y-%m-%d %H:%M:%S.%3N %z" look t)
                "1972-06-30 23:59:59.999 +0000"))
-      (should (equal (decode-time look t 'integer)
-                     '(59 59 23 30 6 1972 5 nil 0)))
-      (should (equal (decode-time look t t)
-                     (list sec 59 23 30 6 1972 5 nil 0)))
+      (timefns-tests--decode-time look t
+                                  (list sec 59 23 30 6 1972 5 nil 0))
       ;; "UTC0".
       (should (string-equal
                (format-time-string format look "UTC0")
                "1972-06-30 23:59:59.999 +0000 (UTC)"))
-      (should (equal (decode-time look "UTC0" 'integer)
-                     '(59 59 23 30 6 1972 5 nil 0)))
-      (should (equal (decode-time look "UTC0" t)
-                     (list sec 59 23 30 6 1972 5 nil 0)))
+      (timefns-tests--decode-time look "UTC0"
+                                  (list sec 59 23 30 6 1972 5 nil 0))
       ;; Negative UTC offset, as a Lisp list.
       (should (string-equal
                (format-time-string format look '(-28800 "PST"))
                "1972-06-30 15:59:59.999 -0800 (PST)"))
-      (should (equal (decode-time look '(-28800 "PST") 'integer)
-                     '(59 59 15 30 6 1972 5 nil -28800)))
-      (should (equal (decode-time look '(-28800 "PST") t)
-                     (list sec 59 15 30 6 1972 5 nil -28800)))
+      (timefns-tests--decode-time look '(-28800 "PST")
+                                  (list sec 59 15 30 6 1972 5 nil -28800))
       ;; Negative UTC offset, as a Lisp integer.
       (should (string-equal
                (format-time-string format look -28800)
@@ -73,18 +77,14 @@
                (if (eq system-type 'windows-nt)
                    "1972-06-30 15:59:59.999 -0800 (ZZZ)"
                  "1972-06-30 15:59:59.999 -0800 (-08)")))
-      (should (equal (decode-time look -28800 'integer)
-                     '(59 59 15 30 6 1972 5 nil -28800)))
-      (should (equal (decode-time look -28800 t)
-                     (list sec 59 15 30 6 1972 5 nil -28800)))
+      (timefns-tests--decode-time look -28800
+                                  (list sec 59 15 30 6 1972 5 nil -28800))
       ;; Positive UTC offset that is not an hour multiple, as a string.
       (should (string-equal
                (format-time-string format look "IST-5:30")
                "1972-07-01 05:29:59.999 +0530 (IST)"))
-      (should (equal (decode-time look "IST-5:30" 'integer)
-                     '(59 29 5 1 7 1972 6 nil 19800)))
-      (should (equal (decode-time look "IST-5:30" t)
-                     (list sec 29 5 1 7 1972 6 nil 19800)))))))
+      (timefns-tests--decode-time look "IST-5:30"
+                                  (list sec 29 5 1 7 1972 6 nil 19800))))))
 
 (ert-deftest decode-then-encode-time ()
   (let ((time-values (list 0 -2 1 0.0 -0.0 -2.0 1.0
@@ -129,6 +129,12 @@
                            most-negative-fixnum most-positive-fixnum
                            (1- most-negative-fixnum)
                            (1+ most-positive-fixnum)
+                           1e1 -1e1 1e-1 -1e-1
+                           1e8 -1e8 1e-8 -1e-8
+                           1e9 -1e9 1e-9 -1e-9
+                           1e10 -1e10 1e-10 -1e-10
+                           1e16 -1e16 1e-16 -1e-16
+                           1e37 -1e37 1e-37 -1e-37
                            1e+INF -1e+INF 1e+NaN -1e+NaN
                            '(0 0 0 1) '(0 0 1 0) '(0 1 0 0) '(1 0 0 0)
                            '(-1 0 0 0) '(1 2 3 4) '(-1 2 3 4)