summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python-dbusmock
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python/recipes-devtools/python/python-dbusmock')
-rw-r--r--meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch53
-rw-r--r--meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch29
-rw-r--r--meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch29
3 files changed, 111 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch b/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
new file mode 100644
index 0000000000..fdd00b6a4d
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
@@ -0,0 +1,53 @@
1From eebe0f66435c4d821b0f5f93f69efe17b4a384c2 Mon Sep 17 00:00:00 2001
2From: Simon Busch <simon.busch@lge.com>
3Date: Wed, 9 Apr 2014 13:18:33 +0200
4Subject: [PATCH 1/2] Add functionality to add own objects to internal object
5 list
6
7In some case the tests might want to create dynamically dbus objects which extended
8functionality from own class definitions within templates. In such cases we need to
9register those objects with the internal object manager of dbusmock.
10
11Signed-off-by: Simon Busch <simon.busch@lge.com>
12---
13 dbusmock/__init__.py | 4 ++--
14 dbusmock/mockobject.py | 8 ++++++++
15 2 files changed, 10 insertions(+), 2 deletions(-)
16
17diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py
18index f799cc7..6718c06 100644
19--- a/dbusmock/__init__.py
20+++ b/dbusmock/__init__.py
21@@ -14,8 +14,8 @@ __license__ = 'LGPL 3+'
22 __version__ = '0.10.1'
23
24 from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE,
25- OBJECT_MANAGER_IFACE, get_object, get_objects)
26+ OBJECT_MANAGER_IFACE, get_object, get_objects, add_object)
27 from dbusmock.testcase import DBusTestCase
28
29 __all__ = ['DBusMockObject', 'MOCK_IFACE', 'OBJECT_MANAGER_IFACE',
30- 'DBusTestCase', 'get_object', 'get_objects']
31+ 'DBusTestCase', 'get_object', 'get_objects', 'add_object']
32diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py
33index 97b79ce..a98e03d 100644
34--- a/dbusmock/mockobject.py
35+++ b/dbusmock/mockobject.py
36@@ -682,6 +682,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup
37 # Helper API for templates
38 #
39
40+def add_object(path, obj):
41+ if path in objects:
42+ raise dbus.exceptions.DBusException(
43+ 'org.freedesktop.DBus.Mock.NameError',
44+ 'object %s already exists' % path)
45+
46+ objects[path] = obj
47+
48
49 def get_objects():
50 '''Return all existing object paths'''
51--
521.7.9.5
53
diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch b/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch
new file mode 100644
index 0000000000..f3ab53c546
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-dbusmock/0001-Don-t-use-gobject-introspection-for-bindings.patch
@@ -0,0 +1,29 @@
1From 29960f2fce7ab42ed0a1bf8ce96499fdb6eedf3c Mon Sep 17 00:00:00 2001
2From: Simon Busch <simon.busch@lge.com>
3Date: Tue, 25 Mar 2014 15:28:54 +0100
4Subject: [PATCH] Don't use gobject introspection for bindings
5
6In our environment we're not providing the glib python bindings through
7introspection but just pygobject so we need to use the right import.
8
9Signed-off-by: Simon Busch <simon.busch@lge.com>
10---
11 dbusmock/__main__.py | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/dbusmock/__main__.py b/dbusmock/__main__.py
15index 44b63fb..bfd089c 100644
16--- a/dbusmock/__main__.py
17+++ b/dbusmock/__main__.py
18@@ -51,7 +51,7 @@ def parse_args():
19
20 if __name__ == '__main__':
21 import dbus.mainloop.glib
22- from gi.repository import GLib
23+ import glib as GLib
24
25 args = parse_args()
26 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
27--
281.7.9.5
29
diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch b/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
new file mode 100644
index 0000000000..981694f0e8
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
@@ -0,0 +1,29 @@
1From ff1dffd5673bcd2cbd9554ad62476d108dbc18af Mon Sep 17 00:00:00 2001
2From: Simon Busch <simon.busch@lge.com>
3Date: Wed, 9 Apr 2014 13:20:33 +0200
4Subject: [PATCH 2/2] Add possibility to import templates from packages
5
6Does not have any unit tests yet.
7
8Signed-off-by: Simon Busch <simon.busch@lge.com>
9---
10 dbusmock/mockobject.py | 3 +++
11 1 file changed, 3 insertions(+)
12
13diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py
14index a98e03d..9530c2a 100644
15--- a/dbusmock/mockobject.py
16+++ b/dbusmock/mockobject.py
17@@ -49,6 +49,9 @@ def load_module(name):
18
19 return module
20
21+ if '.' in name:
22+ return importlib.import_module(name)
23+
24 return importlib.import_module('dbusmock.templates.' + name)
25
26
27--
281.7.9.5
29