Changeset 451:53c0da7549b7

Timestamp:

08/01/08 15:41:41 (5 months ago)

Author:

"Brian Warner <warner@lothar.com>"

branch:

default

Message:

test_logging.py: add incident-gathering/classification test

Files:

• ChangeLog (modified) (1 diff)
• foolscap/test/test_logging.py (modified) (8 diffs)

ChangeLog

@@ -1 +1 @@
-2008-08-01  Brian Warner  <warner@lothar.com>
+
+        * foolscap/test/test_logging.py (IncidentGatherer.test_emit): add
+        test of incident generation, publish, recording, and default
+        classification
-
-        * foolscap/logging/gatherer.py (IncidentGathererService): get

foolscap/test/test_logging.py

@@ -5 +5 @@
-from twisted.trial import unittest
-from twisted.application import service
-, reactor
+
-from twisted.python import log as twisted_log
-from twisted.python import failure, runtime, usage
@@ -191 +191 @@
-    TRAILING_DELAY = 1.0
-    TRAILING_EVENT_LIMIT = 3
+
+class NoFollowUpReporter(incident.IncidentReporter):
+    TRAILING_DELAY = None
-
-class LogfileReaderMixin:
@@ -868 +871 @@
-class MyIncidentGathererService(gatherer.IncidentGathererService):
-    verbose = False
+    cb_new_incident = None
-
-    def remote_logport(self, nodeid, publisher):
@@ -874 +878 @@
-        d.addCallback(lambda res: self.d.callback(publisher))
-        return d
+
+    def new_incident(self, abs_fn, rel_fn, nodeid_s, incident):
+        gatherer.IncidentGathererService.new_incident(self, abs_fn, rel_fn,
+                                                      nodeid_s, incident)
+        if self.cb_new_incident:
+            self.cb_new_incident((abs_fn, rel_fn))
-
-class IncidentGatherer(unittest.TestCase,
@@ -881 +891 @@
-        self.parent.startService()
-        self.logger = log.FoolscapLogger()
+        self.logger.setIncidentReporterFactory(NoFollowUpReporter)
-
-    def tearDown(self):
@@ -888 +899 @@
-        return d
-
-
-
-
-
-
+
-        # create an incident gatherer, which will make its own Tub
-        ig_basedir = os.path.join(basedir, "ig")
@@ -901 +908 @@
-        ig.d = defer.Deferred()
-        ig.setServiceParent(self.parent)
-
+
+
+
-        t = GoodEnoughTub()
-        t.logger = self.logger
@@ -909 +918 @@
-        t.setOption("log-gatherer-furl", ig.my_furl)
-
+    def test_connect(self):
+        basedir = "logging/IncidentGatherer/connect"
+        os.makedirs(basedir)
+        self.logger.setLogDir(basedir)
+
+        ig = self.create_incident_gatherer(basedir)
+        self.create_connected_tub(ig)
+
-        d = ig.d
-
-        # give the call to remote_logport a chance to retire
-        d.addCallback(self.stall, 0.5)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return d
-