Merge lp:~unity-api-team/libqtdbusmock/new-nm-methods into lp:libqtdbusmock

Proposed by Pete Woods on 2015-09-16
Status: Merged
Approved by: Pete Woods on 2015-10-06
Approved revision: 41
Merged at revision: 40
Proposed branch: lp:~unity-api-team/libqtdbusmock/new-nm-methods
Merge into: lp:libqtdbusmock
Diff against target: 96 lines (+26/-13)
5 files modified
data/nm-manager-mock.xml (+15/-0)
debian/changelog (+8/-0)
debian/control (+0/-1)
debian/libqtdbusmock1.symbols (+3/-0)
debian/rules (+0/-12)
To merge this branch: bzr merge lp:~unity-api-team/libqtdbusmock/new-nm-methods
Reviewer Review Type Date Requested Status
Unity Team 2015-09-16 Pending
Review via email: mp+271288@code.launchpad.net

Commit message

Add new NM methods. Stop running valgrind by default.

Description of the change

Add new NM methods. Stop running valgrind by default.

To post a comment you must log in.
41. By Pete Woods on 2015-10-06

Don't run valgrind under jenkins

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/nm-manager-mock.xml'
2--- data/nm-manager-mock.xml 2015-03-09 11:43:23 +0000
3+++ data/nm-manager-mock.xml 2015-10-06 11:46:55 +0000
4@@ -3,6 +3,13 @@
5 <node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
6 <interface name="org.freedesktop.DBus.Mock">
7
8+ <method name="AddEthernetDevice">
9+ <arg direction="in" name="device_name" type="s" />
10+ <arg direction="in" name="iface_name" type="s" />
11+ <arg direction="in" name="state" type="i" />
12+ <arg direction="out" type="s" />
13+ </method>
14+
15 <method name="AddWiFiDevice">
16 <arg name="device_name" type="s" direction="in"/>
17 <arg name="interface_name" type="s" direction="in"/>
18@@ -49,6 +56,14 @@
19 <arg name="connection_path" type="s" direction="in"/>
20 </method>
21
22+ <method name="SetConnectivity">
23+ <arg direction="in" name="connectivity" type="u" />
24+ </method>
25+
26+ <method name="SetDeviceDisconnected">
27+ <arg direction="in" name="device_path" type="s" />
28+ </method>
29+
30 <method name="SetGlobalConnectionState">
31 <arg name="state" type="u" direction="in"/>
32 </method>
33
34=== modified file 'debian/changelog'
35--- debian/changelog 2015-06-04 11:03:42 +0000
36+++ debian/changelog 2015-10-06 11:46:55 +0000
37@@ -1,3 +1,11 @@
38+libqtdbusmock (0.4-0ubuntu1) UNRELEASED; urgency=medium
39+
40+ [ Pete Woods ]
41+ * Add new methods to NetworkManager mock interface.
42+ * Don't run valgrind by default. (LP: #1451507)
43+
44+ -- Pete Woods <pete.woods@canonical.com> Tue, 15 Sep 2015 10:48:13 +0100
45+
46 libqtdbusmock (0.3+15.10.20150604-0ubuntu1) wily; urgency=medium
47
48 [ Pete Woods ]
49
50=== modified file 'debian/control'
51--- debian/control 2015-03-09 11:43:43 +0000
52+++ debian/control 2015-10-06 11:46:55 +0000
53@@ -11,7 +11,6 @@
54 pkg-config,
55 python3-dbusmock (>= 0.14),
56 qtbase5-dev,
57- valgrind [!arm64 !ppc64el],
58 Standards-Version: 3.9.4
59 Homepage: https://launchpad.net/libqtdbustest
60 # If you aren't a member of ~unity-team but need to upload packaging changes,
61
62=== modified file 'debian/libqtdbusmock1.symbols'
63--- debian/libqtdbusmock1.symbols 2015-03-31 11:22:42 +0000
64+++ debian/libqtdbusmock1.symbols 2015-10-06 11:46:55 +0000
65@@ -67,6 +67,9 @@
66 (c++)"NetworkManagerMockInterface::AddActiveConnection(QStringList const&, QString const&, QString const&, QString const&, unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
67 (c++)"NetworkManagerMockInterface::RemoveWifiConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
68 (c++)"NetworkManagerMockInterface::RemoveActiveConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
69+ (c++)"NetworkManagerMockInterface::SetConnectivity(unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
70+ (c++)"NetworkManagerMockInterface::AddEthernetDevice(QString const&, QString const&, int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
71+ (c++)"NetworkManagerMockInterface::SetDeviceDisconnected(QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
72 (c++)"NetworkManagerMockInterface::SetGlobalConnectionState(unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
73 (c++)"NetworkManagerMockInterface::SetProperty(QString const&, QString const&, QString const&, QDBusVariant const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
74 (c++)"OrgFreedesktopDBusMockInterface::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.1
75
76=== modified file 'debian/rules'
77--- debian/rules 2014-03-03 12:47:25 +0000
78+++ debian/rules 2015-10-06 11:46:55 +0000
79@@ -3,17 +3,5 @@
80
81 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
82
83-ifeq ($(DEB_HOST_ARCH),armhf)
84- ENABLE_MEMCHECK_OPTION = OFF
85-else
86- ENABLE_MEMCHECK_OPTION = ON
87-endif
88-
89 %:
90 dh $@ --parallel --fail-missing
91-
92-override_dh_auto_configure:
93- dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
94-
95-override_dh_makeshlibs:
96- dh_makeshlibs -V

Subscribers

People subscribed via source and target branches

to all changes: