diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 231415b7d..9af4d3d33 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-06 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
+ 	* test/GrampsLogger/ErrorReportAssistant_Test.py: added unittest for
+	ErrorReportAssistant
+	
 2006-01-05  Don Allingham  <don@gramps-project.org>
 	* src/GrampsGconfKeys.py: family view detail options
 	* src/GrampsIniKeys.py: family view detail options
diff --git a/gramps2/test/GrampsLogger/ErrorReportAssistant_Test.py b/gramps2/test/GrampsLogger/ErrorReportAssistant_Test.py
new file mode 100644
index 000000000..49c460e77
--- /dev/null
+++ b/gramps2/test/GrampsLogger/ErrorReportAssistant_Test.py
@@ -0,0 +1,54 @@
+import unittest
+import logging
+import sys
+
+log = logging.getLogger('Gramps.Tests.GrampsLogger')
+
+sys.path.append('..')
+try:
+    from guitest.gtktest import GtkTestCase
+    TestCaseBase = GtkTestCase
+    log.info("Using guitest")
+except:
+    TestCaseBase = unittest.TestCase
+
+sys.path.append('../../src')
+sys.path.append('../../src/GrampsLogger')
+
+import const
+const.rootDir = "../../src"
+
+from GrampsLogger import RotateHandler
+
+import _ErrorReportAssistant
+
+class ErrorReportAssistantTest(TestCaseBase):
+    """Test the ErrorReportAssistant."""
+
+    def test_buffer_recall(self):
+        """Test that simple recall of messages works."""
+        
+        rh = RotateHandler(10)
+        l = logging.getLogger("ErrorReportAssistantTest")
+        l.setLevel(logging.DEBUG)
+        
+        l.addHandler(rh)
+        l.info("info message")
+
+        error_detail="Test error"
+        as = _ErrorReportAssistant.ErrorReportAssistant(error_detail=error_detail,
+                                                               rotate_handler=rh)
+
+        assert as._error_detail == error_detail
+        
+        l.removeHandler(rh)
+        
+        
+        
+def testSuite():
+    suite = unittest.makeSuite(ErrorReportAssistantTest,'test')
+    return suite
+
+
+if __name__ == '__main__':
+    unittest.TextTestRunner().run(testSuite())