[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit caeedce5f51e56ef730fc9e9e5d16753815323f3
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Wed Nov 19 16:31:21 2008 +0100

    enable testing subsystem

diff --git a/etc/dbus-1/system.d/frameworkd.conf b/etc/dbus-1/system.d/frameworkd.conf
index 9f6a316..23a8d64 100644
--- a/etc/dbus-1/system.d/frameworkd.conf
+++ b/etc/dbus-1/system.d/frameworkd.conf
@@ -2,6 +2,12 @@
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
     <policy user="root">
+        <allow own="org.freesmartphone.testing"/>
+        <allow send_path="/org/freesmartphone/Testing"/>
+        <allow send_destination="org.freesmartphone.Testing"/>
+        <allow receive_sender="org.freesmartphone.Testing"/>
+    </policy>
+    <policy user="root">
         <allow own="org.freesmartphone.frameworkd"/>
         <allow send_path="/org/freesmartphone/Framework"/>
         <allow send_destination="org.freesmartphone.Framework"/>
diff --git a/framework/subsystems/testing/testing.py b/framework/subsystems/testing/testing.py
index 0533207..f342497 100644
--- a/framework/subsystems/testing/testing.py
+++ b/framework/subsystems/testing/testing.py
@@ -46,19 +46,19 @@ class Resource( resource.Resource ):
     #
     def _enable( self, on_ok, on_error ):
         logger.info( "enabling" )
-        self._doit( "enabling" )
+        self._doit( "enabling", on_ok, on_error )
 
     def _disable( self, on_ok, on_error ):
         logger.info( "disabling" )
-        self._doit( "disabling" )
+        self._doit( "disabling", on_ok, on_error )
 
     def _suspend( self, on_ok, on_error ):
         logger.info( "suspending" )
-        self._doit( "suspending" )
+        self._doit( "suspending", on_ok, on_error )
 
     def _resume( self, on_ok, on_error ):
         logger.info("resuming")
-        self._doit( "resuming" )
+        self._doit( "resuming", on_ok, on_error )
 
     def _doit( self, category, on_ok, on_error ):
         action = self.catmap[ category ]
diff --git a/tools/cli-framework b/tools/cli-framework
index d1f19d4..3d6e187 100755
--- a/tools/cli-framework
+++ b/tools/cli-framework
@@ -10,7 +10,7 @@ Interactive console for the freesmartphone.org framework
 GPLv2 or later
 """
 
-__version__ = "0.9.1.3"
+__version__ = "0.9.1.4"
 
 import dbus.service
 import dbus.mainloop.glib
@@ -94,6 +94,12 @@ gps = getObject( "org.freesmartphone.ogpsd", "/org/freedesktop/Gypsy" )
 # usage device object
 usage = getObject( "org.freesmartphone.ousaged", "/org/freesmartphone/Usage" )
 
+# testing
+testing = getInterface( \
+    "org.freesmartphone.testing",
+    "/org/freesmartphone/Testing",
+    "org.freesmartphone.Testing" )
+
 # framework
 frameworkiface = getInterface( \
     "org.freesmartphone.frameworkd",

-- 
FSO frameworkd Debian packaging