Merge from trunk.

2 files changed, 16 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 396273bab37..dcdef6399e4 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-29  Ulf Jasper  <ulf.jasper@web.de>
+
+        * 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.
+
 2011-10-20  Glenn Morris  <rgm@gnu.org>
 
         * automated/vc-bzr.el (vc-bzr-test-bug9781): New test.
diff --git a/test/automated/newsticker-tests.el b/test/automated/newsticker-tests.el
index 76f4345da55..ba7fe20786b 100644
--- a/test/automated/newsticker-tests.el
+++ b/test/automated/newsticker-tests.el
@@ -138,8 +138,14 @@ Apply to INPUT and compare with EXPECTED."
 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
+    (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))))