Commit 78ddf6ba authored by Michael Albinus's avatar Michael Albinus
Browse files

Improve time arithmetic in tramp--test-file-attributes-equal-p

* test/lisp/net/tramp-tests.el (tramp--test-file-attributes-equal-p):
Improve time arithmetic.
parent 4084c160
Pipeline #2791 failed with stage
in 53 minutes and 37 seconds
......@@ -3089,9 +3089,11 @@ They might differ only in time attributes or directory size."
(let ((attr1 (copy-sequence attr1))
(attr2 (copy-sequence attr2))
(start-time
(aref
(ert--stats-test-start-times ert--current-run-stats)
(ert--stats-test-pos ert--current-run-stats (ert-running-test)))))
(floor
(float-time
(aref
(ert--stats-test-start-times ert--current-run-stats)
(ert--stats-test-pos ert--current-run-stats (ert-running-test)))))))
;; Access time.
(setcar (nthcdr 4 attr1) tramp-time-dont-know)
(setcar (nthcdr 4 attr2) tramp-time-dont-know)
......@@ -3104,24 +3106,25 @@ They might differ only in time attributes or directory size."
(tramp-compat-time-equal-p (nth 5 attr2) tramp-time-dont-know))
(setcar (nthcdr 5 attr1) tramp-time-dont-know)
(setcar (nthcdr 5 attr2) tramp-time-dont-know))
(when (time-less-p start-time (nth 5 attr1))
(when (<= start-time (floor (float-time (nth 5 attr1))))
(setcar (nthcdr 5 attr1) tramp-time-dont-know))
(when (time-less-p start-time (nth 5 attr2))
(when (<= start-time (floor (float-time (nth 5 attr2))))
(setcar (nthcdr 5 attr2) tramp-time-dont-know))
;; Status change time. Dito.
(when (or (tramp-compat-time-equal-p (nth 6 attr1) tramp-time-dont-know)
(tramp-compat-time-equal-p (nth 6 attr2) tramp-time-dont-know))
(setcar (nthcdr 6 attr1) tramp-time-dont-know)
(setcar (nthcdr 6 attr2) tramp-time-dont-know))
(when (time-less-p start-time (nth 6 attr1))
(when (<= start-time (floor (float-time (nth 6 attr1))))
(setcar (nthcdr 6 attr1) tramp-time-dont-know))
(when (time-less-p start-time (nth 6 attr2))
(when (<= start-time (floor (float-time (nth 6 attr2))))
(setcar (nthcdr 6 attr2) tramp-time-dont-know))
;; Size. Set it to 0 for directories, because it might have
;; changed. For example the upper directory "../".
(when (eq (car attr1) t) (setcar (nthcdr 7 attr1) 0))
(when (eq (car attr2) t) (setcar (nthcdr 7 attr2) 0))
;; The check.
(unless (equal attr1 attr2) (tramp--test-message "%S\n%S" attr1 attr2))
(equal attr1 attr2)))
;; This isn't 100% correct, but better than no explainer at all.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment