Merge from origin/emacs-27

35661ef943 (origin/emacs-27) Fix typo in "(elisp) Type Keywords"
1af0e95fec Gnus nnir-summary-line-format has no effect
dd366b5d3b Improve documentation of 'window-text-pixel-size'
fbd49f969e * src/xdisp.c (Fwindow_text_pixel_size): Doc fix.  (Bug#41...
d8593fd19f Minor improvements to EDE and EIEIO manuals
3916e63f9e Have Fido mode also imitate Ido mode in ignore-case options
cc35b197c7 Update package-menu-quick-help
bf09106256 Improve documentation of 'sort-subr'
73749efa13 Update Ukrainian transliteration
30a7ee505a Fix Arabic shaping when eww/shr fill the text to be rendered
7d323f07c0 Silence some byte-compiler warnings in tests
cf473e742f * test/lisp/battery-tests.el: New file.
b07e3b1d97 Improve format-spec documentation (bug#41571)

# Conflicts:
#	test/lisp/emacs-lisp/package-tests.el

1 files changed, 2 insertions, 3 deletions

diff --git a/test/lisp/image/exif-tests.el b/test/lisp/image/exif-tests.el
index 8a2231106f0..9e5da46b508 100644
--- a/test/lisp/image/exif-tests.el
+++ b/test/lisp/image/exif-tests.el
@@ -21,7 +21,6 @@
 
 (require 'ert)
 (require 'exif)
-(require 'seq)
 
 (defun test-image-file (name)
   (expand-file-name
@@ -49,7 +48,7 @@
     (should (equal (exif-elem exif 'artist) "z"))))
 
 (ert-deftest test-exit-direct-ascii-value ()
-  (equal (exif--direct-ascii-value 28005 2 t) (string ?e ?m 0))
-  (equal (exif--direct-ascii-value 28005 2 nil) (string ?m ?e 0)))
+  (should (equal (exif--direct-ascii-value 28005 2 t) (string ?e ?m 0)))
+  (should (equal (exif--direct-ascii-value 28005 2 nil) (string ?m ?e 0))))
 
 ;;; exif-tests.el ends here