summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 15:08:08 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:39 -0700
commitaaee985fb5acd4fe6dc818053e2a05e6a065cd10 (patch)
tree725a90c01bb379361d9a77ae5a4f5c7366c6b532 /meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch
parenteda0d3ecb3cde4ac57d418622b26865eb364af0c (diff)
downloadmeta-openembedded-aaee985fb5acd4fe6dc818053e2a05e6a065cd10.tar.gz
pyton-dbusmuck: refresh patches
WARNING: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify <recipe> devtool finish --force-patch-refresh <recipe> <layer_path> Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: checking file dbusmock/__init__.py Hunk #1 succeeded at 14 with fuzz 1. checking file dbusmock/mockobject.py Hunk #1 succeeded at 688 (offset 6 lines). and others Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch')
-rw-r--r--meta-python/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch21
1 files changed, 10 insertions, 11 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
index fdd00b6a4d..c4d817849f 100644
--- 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
@@ -1,7 +1,8 @@
1From eebe0f66435c4d821b0f5f93f69efe17b4a384c2 Mon Sep 17 00:00:00 2001 1From c4436fd42f2936e5fb0f95434d06e45aa9959ca0 Mon Sep 17 00:00:00 2001
2From: Simon Busch <simon.busch@lge.com> 2From: Simon Busch <simon.busch@lge.com>
3Date: Wed, 9 Apr 2014 13:18:33 +0200 3Date: Wed, 9 Apr 2014 13:18:33 +0200
4Subject: [PATCH 1/2] Add functionality to add own objects to internal object 4Subject: [PATCH] Add functionality to add own objects to internal object
5
5 list 6 list
6 7
7In some case the tests might want to create dynamically dbus objects which extended 8In some case the tests might want to create dynamically dbus objects which extended
@@ -9,17 +10,18 @@ functionality from own class definitions within templates. In such cases we need
9register those objects with the internal object manager of dbusmock. 10register those objects with the internal object manager of dbusmock.
10 11
11Signed-off-by: Simon Busch <simon.busch@lge.com> 12Signed-off-by: Simon Busch <simon.busch@lge.com>
13
12--- 14---
13 dbusmock/__init__.py | 4 ++-- 15 dbusmock/__init__.py | 4 ++--
14 dbusmock/mockobject.py | 8 ++++++++ 16 dbusmock/mockobject.py | 8 ++++++++
15 2 files changed, 10 insertions(+), 2 deletions(-) 17 2 files changed, 10 insertions(+), 2 deletions(-)
16 18
17diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py 19diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py
18index f799cc7..6718c06 100644 20index 8a482ab..3d5d71a 100644
19--- a/dbusmock/__init__.py 21--- a/dbusmock/__init__.py
20+++ b/dbusmock/__init__.py 22+++ b/dbusmock/__init__.py
21@@ -14,8 +14,8 @@ __license__ = 'LGPL 3+' 23@@ -14,8 +14,8 @@ __license__ = 'LGPL 3+'
22 __version__ = '0.10.1' 24 __version__ = '0.16.7'
23 25
24 from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE, 26 from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE,
25- OBJECT_MANAGER_IFACE, get_object, get_objects) 27- OBJECT_MANAGER_IFACE, get_object, get_objects)
@@ -30,10 +32,10 @@ index f799cc7..6718c06 100644
30- 'DBusTestCase', 'get_object', 'get_objects'] 32- 'DBusTestCase', 'get_object', 'get_objects']
31+ 'DBusTestCase', 'get_object', 'get_objects', 'add_object'] 33+ 'DBusTestCase', 'get_object', 'get_objects', 'add_object']
32diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py 34diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py
33index 97b79ce..a98e03d 100644 35index 586dbad..e4f130f 100644
34--- a/dbusmock/mockobject.py 36--- a/dbusmock/mockobject.py
35+++ b/dbusmock/mockobject.py 37+++ b/dbusmock/mockobject.py
36@@ -682,6 +682,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup 38@@ -688,6 +688,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup
37 # Helper API for templates 39 # Helper API for templates
38 # 40 #
39 41
@@ -48,6 +50,3 @@ index 97b79ce..a98e03d 100644
48 50
49 def get_objects(): 51 def get_objects():
50 '''Return all existing object paths''' 52 '''Return all existing object paths'''
51--
521.7.9.5
53