[Emacs-diffs] /srv/bzr/emacs/trunk r106238: newsticker: Fixed bug#9763, again

[Ulf Jasper]

------------------------------------------------------------
revno: 106238
committer: Ulf Jasper <address@hidden>
branch nick: trunk
timestamp: Sat 2011-10-29 17:29:16 +0200
message:
  newsticker: Fixed bug#9763, again
  
  2011-10-29  Ulf Jasper  <address@hidden>
  
        * automated/newsticker-tests.el
        (newsticker--group-manage-orphan-feeds): Use fset instead of flet.
modified:
  test/ChangeLog
  test/automated/newsticker-tests.el

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2011-10-29 15:17:30 +0000
+++ b/test/ChangeLog    2011-10-29 15:29:16 +0000
@@ -1,5 +1,8 @@
 2011-10-29  Ulf Jasper  <address@hidden>
 
+       * automated/newsticker-tests.el
+       (newsticker--group-manage-orphan-feeds): Use fset instead of flet.
+
        * trunk/test/automated/newsticker-tests.el
        (newsticker--group-manage-orphan-feeds): Prevent updating
        newsticker treeview. Fixed bug#9763.

=== modified file 'test/automated/newsticker-tests.el'
--- a/test/automated/newsticker-tests.el        2011-10-29 15:17:30 +0000
+++ b/test/automated/newsticker-tests.el        2011-10-29 15:29:16 +0000
@@ -138,11 +138,14 @@
 Signals an error if something goes wrong."
   (let ((newsticker-groups '("Feeds"))
         (newsticker-url-list-defaults nil)
-        (newsticker-url-list '(("feed1") ("feed2") ("feed3"))))
+        (newsticker-url-list '(("feed1") ("feed2") ("feed3")))
+        t-nttvtu)
     ;; prevent updating the treeview as it does not exist during fully
     ;; automated tests
-    (flet ((newsticker--treeview-tree-update nil nil))
-      (newsticker--group-manage-orphan-feeds))
+    (fset 't-nttvtu (symbol-function 'newsticker--treeview-tree-update))
+    (fset 'newsticker--treeview-tree-update (lambda() nil))
+    (newsticker--group-manage-orphan-feeds)
+    (fset 'newsticker--treeview-tree-update (symbol-function 't-nttvtu))
     (should (equal '("Feeds" "feed3" "feed2" "feed1")
                    newsticker-groups))))