Adjust whitespace tests

diff --git a/test/lisp/whitespace-tests.el b/test/lisp/whitespace-tests.el
index 07eaad4862b29ce19e907453660a29a2d36a00d8..2a59bfe9d8062b8d793e0ccb52de4eebc19d94d3 100644 (file)
--- a/test/lisp/whitespace-tests.el
+++ b/test/lisp/whitespace-tests.el
@@ -52,9 +52,9 @@
 ;; mode.  So we call its innards instead.
 (defun whitespace-tests-whitespace-mode-on ()
   "Turn `whitespace-mode' on even in batch mode."
+  (setq whitespace-mode t)
   (whitespace-turn-on)
-  (whitespace-action-when-on)
-  (setq whitespace-mode t))
+  (whitespace-action-when-on))
 
 (ert-deftest whitespace-tests-display-tables ()
   "Test whitespace stores and restores the buffer display table - bug26892."
@@ -77,7 +77,6 @@
       ;test the stored display table is preserved
       (should (equal nil
                      (progn (whitespace-tests-whitespace-mode-on)
-                            (whitespace-tests-whitespace-mode-on)
                             (whitespace-turn-off)
                             buffer-display-table))))))