Merge lp:~mandel/desktopcouch/fix_direct_access_find_port into lp:desktopcouch

[Manuel de la Peña]

Fix the dbus object that exposes the getPort api from desktopcouch.

Fix the dbus object that exposes the getPort api from desktopcouch.

[Eric Casteleijn (thisfred)]

Looks good to me. tests pass.

review: Approve

[John Lenton (chipaca)]

review: Approve

=== modified file 'desktopcouch/platform/linux/ipc.py'
--- desktopcouch/platform/linux/ipc.py	2010-10-31 21:37:35 +0000
+++ desktopcouch/platform/linux/ipc.py	2010-11-03 20:59:50 +0000
@@ -22,13 +22,14 @@
 
 import dbus.service
 
-import desktopcouch
+from desktopcouch.platform.linux import direct_access_find_port
 
 class PortAdvertiser(dbus.service.Object):
     "Advertise the discovered port number on the D-Bus Session bus"
-    def __init__(self, death):
+    def __init__(self, death, ctx):
         self.conn = dbus.SessionBus()
         self.death = death
+        self.ctx = ctx
         super(PortAdvertiser, self).__init__(object_path="/", 
             conn=self.conn)
 
@@ -37,10 +38,10 @@
                 bus=self.conn)
 
     @dbus.service.method(dbus_interface='org.desktopcouch.CouchDB',
-                         in_signature='', out_signature='i')
+                         in_signature = '', out_signature = 'i')
     def getPort(self):
         "Exported method to return the port"
-        port = int(desktopcouch._direct_access_find_port())
+        port = int(direct_access_find_port(self.ctx))
         return port
 
     @dbus.service.method(dbus_interface='org.desktopcouch.CouchDB',
 
=== modified file 'desktopcouch/service.py'
--- desktopcouch/service.py	2010-10-31 21:37:35 +0000
+++ desktopcouch/service.py	2010-11-03 20:59:50 +0000
@@ -82,9 +82,9 @@
         port_finder=desktopcouch.platform.direct_access_find_port,
         ctx=local_files.DEFAULT_CONTEXT,
         stop_couchdb=stop_local_couchdb.stop_couchdb,
-        replication=replication,
+        replication_actions=replication,
         advertiser_factory=PortAdvertiser,
-        logging=set_up_logging,
+        set_logging=set_up_logging,
         resources = pkg_resources,
         fork=os.fork,
         nice=os.nice,
@@ -95,9 +95,9 @@
         self._port_finder = port_finder
         self._ctx = ctx
         self._stop_couchdb = stop_couchdb
-        self._replication = replication
+        self._replication = replication_actions
         self._advertiser_factory = advertiser_factory
-        self._logging = logging
+        self._logging = set_logging
         self._resources = resources
         self._fork = fork
         self._nice = nice
@@ -116,7 +116,8 @@
                 replication.tear_down(*replication_runtime)
 
     def _start_server_main(self):
-        portAdvertiser = self._advertiser_factory(self._mainloop.stop)
+        port_advertiser = self._advertiser_factory(self._mainloop.stop, 
+            self._ctx)
         logging.debug("starting dbus main loop")
         try:
             # we execute the extensions that have been registered
 
=== modified file 'desktopcouch/tests/test_service.py'
--- desktopcouch/tests/test_service.py	2010-10-31 18:21:50 +0000
+++ desktopcouch/tests/test_service.py	2010-11-03 20:59:50 +0000
@@ -45,9 +45,9 @@
             port_finder=self._port_finder,
             ctx=self._ctx,
             stop_couchdb=self._stop_couchdb,
-            replication=self._replication,
+            replication_actions=self._replication,
             advertiser_factory=self._advertiser,
-            logging=set_up_logging,
+            set_logging=set_up_logging,
             fork=self._fork,
             nice=self._nice,
             kill=self._kill,
@@ -71,7 +71,7 @@
         self.mocker.result(234)
         self._mainloop.stop
         self.mocker.result(ANY)
-        self._advertiser(ANY)
+        self._advertiser(ANY, self._ctx)
         self._resources.iter_entry_points(
             group=desktopcouch.service.MAIN_START_EXTENSION_ENTRY_POINT)
         self.mocker.result([])
@@ -100,7 +100,7 @@
         self.mocker.result(234)
         self._mainloop.stop
         self.mocker.result(ANY)
-        self._advertiser(ANY)
+        self._advertiser(ANY, self._ctx)
         self._resources.iter_entry_points(
             group=desktopcouch.service.MAIN_START_EXTENSION_ENTRY_POINT)
         self.mocker.result([self._start_extension])