[Emacs-diffs] emacs-26 7612dd1 4/5: Adjust eieio persistence tests for expected failure

[Eric Abrahamsen]

branch: emacs-26
commit 7612dd14b60317b0d216112acdc169724aa0b464
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    Adjust eieio persistence tests for expected failure
    
    * test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
     (eieio-test-persist-hash-and-vector,
      eieio-test-persist-interior-lists): Persistence does not currently
     handle deeply-nested objects. Expect current failures, and mark for
     future fixes.
---
 test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el 
b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
index ff4aaf7..eae69c8 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
@@ -291,10 +291,14 @@ persistent class.")
     (puthash "Bob" bob (slot-value class 'students))
     (aset (slot-value class 'random-vector) 0
           (make-instance 'persistent-random-class))
-    (aset (car (slot-value class 'janitor)) 1 hans)
-    (aset (nth 1 (slot-value class 'janitor)) 1 dierdre)
     (unwind-protect
         (persist-test-save-and-compare class)
+      (delete-file (oref class file)))
+    (aset (car (slot-value class 'janitors)) 1 hans)
+    (aset (nth 1 (slot-value class 'janitors)) 1 dierdre)
+    (unwind-protect
+        ;; FIXME: This should not error.
+        (should-error (persist-test-save-and-compare class))
       (delete-file (oref class file)))))
 
 ;; Extra quotation of lists inside other objects (Gnus registry), also
@@ -322,13 +326,17 @@ persistent class.")
          (alexie (make-instance 'person :name "Alexie"))
          (alst '(("first" (one two three))
                  ("second" (four five six)))))
-    (setf (nth 2 (cadar alst)) john
-          (nth 2 (cadadr alst)) alexie)
     (setf (slot-value thing 'alist) alst)
     (puthash "alst" alst (slot-value thing 'htab))
     (aset (slot-value thing 'vec) 0 alst)
     (unwind-protect
         (persist-test-save-and-compare thing)
+      (delete-file (slot-value thing 'file)))
+    (setf (nth 2 (cadar alst)) john
+          (nth 2 (cadadr alst)) alexie)
+    (unwind-protect
+        ;; FIXME: Should not error.
+        (should-error (persist-test-save-and-compare thing))
       (delete-file (slot-value thing 'file)))))
 
 ;;; eieio-test-persist.el ends here