Merge lp:~mvo/software-center/fix-dataprovider-dbus-tests into lp:software-center

[Michael Vogt]

This properly isolates the dbus test for the dataprovider from the
session bus. For the upload of 5.3.14 this test was disabled to get
the upload out quickly but this branch now fixes this properly.

=== modified file 'softwarecenter/db/dataprovider.py'
--- softwarecenter/db/dataprovider.py	2012-09-17 12:42:08 +0000
+++ softwarecenter/db/dataprovider.py	2012-09-18 11:44:21 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical
+# Copyright (C) 2012 Canonical
 #
 # Authors:
 #  Michael Vogt

=== modified file 'tests/test_dataprovider.py'
--- tests/test_dataprovider.py	2012-09-18 09:21:16 +0000
+++ tests/test_dataprovider.py	2012-09-18 11:44:21 +0000
@@ -1,12 +1,13 @@
-
+import copy
 import dbus
+import os
+import subprocess
 import time
 import unittest
 
 from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
-from multiprocessing import Process
 from mock import Mock
 
 from tests.utils import (
@@ -19,40 +20,52 @@
 from softwarecenter.db.application import AppDetails
 from softwarecenter.db.dataprovider import (
     SoftwareCenterDataProvider,
-    dbus_main,
     DBUS_BUS_NAME,
     DBUS_DATA_PROVIDER_IFACE,
     DBUS_DATA_PROVIDER_PATH,
     )
 
 
+def start_data_provider_daemon(dbus_address):
+    """Start the dbus data provider as a subprocess"""
+    os.environ["DBUS_SESSION_BUS_ADDRESS"] = dbus_address
+    testdir = os.path.dirname(__file__)
+    basedir = os.path.abspath(os.path.join(testdir, ".."))
+    data_provider_bin = os.path.join(basedir, "software-center-dbus")
+    stderr = open(os.devnull, "w")
+    # uncomment this for a flurry of debug output
+    #stderr = None
+    # this is more reliable than e.g. threading.Thead or multiprocess.Process
+    p = subprocess.Popen([data_provider_bin], stderr=stderr)
+    return p
+
+
 class DbusForRealTestCase(unittest.TestCase):
     """Test the dataprovider over a real dbus bus"""
 
     @classmethod
     def setUpClass(cls):
-        cls.p = Process(target=dbus_main)
-        cls.p.start()
+        cls.dbus_daemon_proc, dbus_address = start_dbus_daemon()
+        cls.bus = dbus.bus.BusConnection(dbus_address)
+        cls.data_provider_proc = start_data_provider_daemon(dbus_address)
         time.sleep(1)
 
     @classmethod
     def tearDownClass(cls):
-        print "down"
-        cls.p.terminate()
-        cls.p.join()
+        kill_process(cls.data_provider_proc)
+        kill_process(cls.dbus_daemon_proc)
 
     def setUp(self):
-        bus = dbus.SessionBus()
-        obj = bus.get_object(bus_name=DBUS_BUS_NAME,
+        obj = self.bus.get_object(bus_name=DBUS_BUS_NAME,
                          object_path=DBUS_DATA_PROVIDER_PATH,
                          follow_name_owner_changes=True)
         self.proxy = dbus.Interface(object=obj,
                                dbus_interface=DBUS_DATA_PROVIDER_IFACE)
 
-    @unittest.skip("not reliable yet")
-    def test_dbus_for_real(self):
-        result = self.proxy.GetAppDetails("", "gedit")
-        self.assertEqual(result["pkgname"], "gedit")
+    def test_dbus_on_real_bus(self):
+        result = self.proxy.GetAppDetails("", "gimp")
+        self.assertEqual(result["pkgname"], "gimp")
+        self.assertEqual(result["icon"], "gimp")
 
 
 class PropertyDictExceptionsTestCase(unittest.TestCase):