[Emacs-diffs] trunk r117578: Work around the failures in icalendar-tests which occasionally occur

[Ulf Jasper]

------------------------------------------------------------
revno: 117578
revision-id: address@hidden
parent: address@hidden
committer: Ulf Jasper <address@hidden>
branch nick: trunk
timestamp: Sat 2014-07-26 14:53:36 +0200
message:
  Work around the failures in icalendar-tests which occasionally occur
  on hydra.nixos.org.
  
  
        * automated/icalendar-tests.el (icalendar-tests--do-test-import):
        Work around the failures in icalendar-tests which occasionally occur on
        hydra.nixos.org.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/icalendar-tests.el 
icalendartestsuite.e-20091113204419-o5vbwnq5f7feedwu-8590

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-07-21 06:03:08 +0000
+++ b/test/ChangeLog    2014-07-26 12:53:36 +0000
@@ -1,3 +1,9 @@
+2014-07-26  Ulf Jasper  <address@hidden>
+
+       * automated/icalendar-tests.el (icalendar-tests--do-test-import):
+       Work around the failures in icalendar-tests which occasionally occur on
+       hydra.nixos.org.
+
 2014-07-21  Fabián Ezequiel Gallina  <address@hidden>
 
        * automated/python-tests.el:

=== modified file 'test/automated/icalendar-tests.el'
--- a/test/automated/icalendar-tests.el 2014-01-01 07:43:34 +0000
+++ b/test/automated/icalendar-tests.el 2014-07-26 12:53:36 +0000
@@ -718,11 +718,34 @@
 Argument INPUT input icalendar string.
 Argument EXPECTED-OUTPUT expected diary string."
   (let ((temp-file (make-temp-file "icalendar-test-diary")))
+    ;; Test the Catch-the-mysterious-coding-header logic below.
+    ;; Ruby-mode adds an after-save-hook which inserts the header!
+    ;; (save-excursion
+    ;;   (find-file temp-file)
+    ;;   (ruby-mode))
     (icalendar-import-buffer temp-file t t)
     (save-excursion
       (find-file temp-file)
+      ;; Check for the mysterious "# coding: ..." header, remove it
+      ;; and give a shout
+      (goto-char (point-min))
+      (when (re-search-forward "# coding: .*?\n" nil t)
+        (message (concat "%s\n"
+                         "Found mysterious \"# coding ...\" header!  Removing 
it.\n"
+                         "Current Modes: %s, %s\n"
+                         "Current test: %s\n"
+                         "%s")
+                 (make-string 70 ?*)
+                 major-mode
+                 minor-mode-list
+                 (ert-running-test)
+                 (make-string 70 ?*))
+        (buffer-disable-undo)
+        (replace-match "")
+        (set-buffer-modified-p nil))
+
       (let ((result (buffer-substring-no-properties (point-min) (point-max))))
-       (should (string= expected-output result)))
+        (should (string= expected-output result)))
       (kill-buffer (find-buffer-visiting temp-file))
       (delete-file temp-file))))