summaryrefslogtreecommitdiff
path: root/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
diff options
context:
space:
mode:
authorDave Cobbley <david.j.cobbley@linux.intel.com>2018-08-14 20:05:37 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-08-23 04:26:31 +0300
commiteb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch)
treede291a73dc37168da6370e2cf16c347d1eba9df8 /import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
parent9c3cf826d853102535ead04cebc2d6023eff3032 (diff)
downloadopenbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch')
-rw-r--r--import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch b/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
deleted file mode 100644
index c4d817849..000000000
--- a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c4436fd42f2936e5fb0f95434d06e45aa9959ca0 Mon Sep 17 00:00:00 2001
-From: Simon Busch <simon.busch@lge.com>
-Date: Wed, 9 Apr 2014 13:18:33 +0200
-Subject: [PATCH] Add functionality to add own objects to internal object
-
- list
-
-In some case the tests might want to create dynamically dbus objects which extended
-functionality from own class definitions within templates. In such cases we need to
-register those objects with the internal object manager of dbusmock.
-
-Signed-off-by: Simon Busch <simon.busch@lge.com>
-
----
- dbusmock/__init__.py | 4 ++--
- dbusmock/mockobject.py | 8 ++++++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py
-index 8a482ab..3d5d71a 100644
---- a/dbusmock/__init__.py
-+++ b/dbusmock/__init__.py
-@@ -14,8 +14,8 @@ __license__ = 'LGPL 3+'
- __version__ = '0.16.7'
-
- from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE,
-- OBJECT_MANAGER_IFACE, get_object, get_objects)
-+ OBJECT_MANAGER_IFACE, get_object, get_objects, add_object)
- from dbusmock.testcase import DBusTestCase
-
- __all__ = ['DBusMockObject', 'MOCK_IFACE', 'OBJECT_MANAGER_IFACE',
-- 'DBusTestCase', 'get_object', 'get_objects']
-+ 'DBusTestCase', 'get_object', 'get_objects', 'add_object']
-diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py
-index 586dbad..e4f130f 100644
---- a/dbusmock/mockobject.py
-+++ b/dbusmock/mockobject.py
-@@ -688,6 +688,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup
- # Helper API for templates
- #
-
-+def add_object(path, obj):
-+ if path in objects:
-+ raise dbus.exceptions.DBusException(
-+ 'org.freedesktop.DBus.Mock.NameError',
-+ 'object %s already exists' % path)
-+
-+ objects[path] = obj
-+
-
- def get_objects():
- '''Return all existing object paths'''