[conduit: 133/138] Attach dbus monitor logs

[John Carr <johncarr src gnome org>]

commit 864e8ef3f8d9e69fbcd7fd28261a64cd49bc5326
Author: John Carr <john carr unrouted co uk>
Date:   Thu May 7 02:52:29 2009 -0700

    Attach dbus monitor logs
---
 conduit/modules/FeedModule/Makefile.am |    2 +-
 test/soup/env/fake-dbus.py             |    7 +++----
 test/soup/modules/feed.py              |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/conduit/modules/FeedModule/Makefile.am b/conduit/modules/FeedModule/Makefile.am
index 1269fa5..50e2ef3 100644
--- a/conduit/modules/FeedModule/Makefile.am
+++ b/conduit/modules/FeedModule/Makefile.am
@@ -1,5 +1,5 @@
 conduit_handlersdir = $(libdir)/conduit/modules/FeedModule
-conduit_handlers_PYTHON = FeedModule.py
+conduit_handlers_PYTHON = __init__.py FeedModule.py
 
 clean-local:
 	rm -rf *.pyc *.pyo
diff --git a/conduit/modules/FeedModule/__init__.py b/conduit/modules/FeedModule/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/soup/env/fake-dbus.py b/test/soup/env/fake-dbus.py
index eb9e72b..c73bf6f 100644
--- a/test/soup/env/fake-dbus.py
+++ b/test/soup/env/fake-dbus.py
@@ -40,14 +40,13 @@ class Dbus(soup.env.EnvironmentWrapper):
         os.environ['DBUS_SESSION_BUS_ADDRESS'] = self.address
 
     def decorate_test(self, test):
-        def _(*args, **kwargs):
+        def _(result, *args, **kwargs):
             logfile = tempfile.TemporaryFile()
             p = subprocess.Popen("dbus-monitor", stdout=logfile, stderr=subprocess.STDOUT, close_fds=True)
-            test(*args, **kwargs)
+            test(result, *args, **kwargs)
             os.kill(p.pid, signal.SIGINT)
             logfile.seek(0)
-            # FIXME: Need some way to attach data to a test
-            # print open(f).read()
+            result.addAttachment(test, "D-Bus Monitor logs", logfile.read())
         return _
 
     def finalize_environment(self):
diff --git a/test/soup/modules/feed.py b/test/soup/modules/feed.py
index 417fbfc..8ab7136 100644
--- a/test/soup/modules/feed.py
+++ b/test/soup/modules/feed.py
@@ -5,7 +5,7 @@ import soup.modules
 from soup.data.file import FileWrapper
 from soup.utils.test import Online
 
-import conduit.modules.FeedModule as FeedModule
+import conduit.modules.FeedModule.FeedModule as FeedModule
 import conduit.utils as Utils
 
 FeedPackages = soup.utils.test.Package("feedparser")