libqtdbusmock

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

  1. new-nm-methods
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
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 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.
lp:~unity-api-team/libqtdbusmock/new-nm-methods updated
41. By Pete Woods

Don't run valgrind under jenkins

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/nm-manager-mock.xml'
--- data/nm-manager-mock.xml 2015-03-09 11:43:23 +0000
+++ data/nm-manager-mock.xml 2015-10-06 11:46:55 +0000
@@ -3,6 +3,13 @@
3<node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">3<node name="/org/freedesktop/NetworkManager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
4 <interface name="org.freedesktop.DBus.Mock">4 <interface name="org.freedesktop.DBus.Mock">
55
6 <method name="AddEthernetDevice">
7 <arg direction="in" name="device_name" type="s" />
8 <arg direction="in" name="iface_name" type="s" />
9 <arg direction="in" name="state" type="i" />
10 <arg direction="out" type="s" />
11 </method>
12
6 <method name="AddWiFiDevice">13 <method name="AddWiFiDevice">
7 <arg name="device_name" type="s" direction="in"/>14 <arg name="device_name" type="s" direction="in"/>
8 <arg name="interface_name" type="s" direction="in"/>15 <arg name="interface_name" type="s" direction="in"/>
@@ -49,6 +56,14 @@
49 <arg name="connection_path" type="s" direction="in"/>56 <arg name="connection_path" type="s" direction="in"/>
50 </method>57 </method>
5158
59 <method name="SetConnectivity">
60 <arg direction="in" name="connectivity" type="u" />
61 </method>
62
63 <method name="SetDeviceDisconnected">
64 <arg direction="in" name="device_path" type="s" />
65 </method>
66
52 <method name="SetGlobalConnectionState">67 <method name="SetGlobalConnectionState">
53 <arg name="state" type="u" direction="in"/>68 <arg name="state" type="u" direction="in"/>
54 </method>69 </method>
5570
=== modified file 'debian/changelog'
--- debian/changelog 2015-06-04 11:03:42 +0000
+++ debian/changelog 2015-10-06 11:46:55 +0000
@@ -1,3 +1,11 @@
1libqtdbusmock (0.4-0ubuntu1) UNRELEASED; urgency=medium
2
3 [ Pete Woods ]
4 * Add new methods to NetworkManager mock interface.
5 * Don't run valgrind by default. (LP: #1451507)
6
7 -- Pete Woods <pete.woods@canonical.com> Tue, 15 Sep 2015 10:48:13 +0100
8
1libqtdbusmock (0.3+15.10.20150604-0ubuntu1) wily; urgency=medium9libqtdbusmock (0.3+15.10.20150604-0ubuntu1) wily; urgency=medium
210
3 [ Pete Woods ]11 [ Pete Woods ]
412
=== modified file 'debian/control'
--- debian/control 2015-03-09 11:43:43 +0000
+++ debian/control 2015-10-06 11:46:55 +0000
@@ -11,7 +11,6 @@
11 pkg-config,11 pkg-config,
12 python3-dbusmock (>= 0.14),12 python3-dbusmock (>= 0.14),
13 qtbase5-dev,13 qtbase5-dev,
14 valgrind [!arm64 !ppc64el],
15Standards-Version: 3.9.414Standards-Version: 3.9.4
16Homepage: https://launchpad.net/libqtdbustest15Homepage: https://launchpad.net/libqtdbustest
17# If you aren't a member of ~unity-team but need to upload packaging changes,16# If you aren't a member of ~unity-team but need to upload packaging changes,
1817
=== modified file 'debian/libqtdbusmock1.symbols'
--- debian/libqtdbusmock1.symbols 2015-03-31 11:22:42 +0000
+++ debian/libqtdbusmock1.symbols 2015-10-06 11:46:55 +0000
@@ -67,6 +67,9 @@
67 (c++)"NetworkManagerMockInterface::AddActiveConnection(QStringList const&, QString const&, QString const&, QString const&, unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.2015033167 (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
68 (c++)"NetworkManagerMockInterface::RemoveWifiConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.2015033168 (c++)"NetworkManagerMockInterface::RemoveWifiConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
69 (c++)"NetworkManagerMockInterface::RemoveActiveConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.2015033169 (c++)"NetworkManagerMockInterface::RemoveActiveConnection(QString const&, QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
70 (c++)"NetworkManagerMockInterface::SetConnectivity(unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
71 (c++)"NetworkManagerMockInterface::AddEthernetDevice(QString const&, QString const&, int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
72 (c++)"NetworkManagerMockInterface::SetDeviceDisconnected(QString const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0replaceme
70 (c++)"NetworkManagerMockInterface::SetGlobalConnectionState(unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.2015033173 (c++)"NetworkManagerMockInterface::SetGlobalConnectionState(unsigned int)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
71 (c++)"NetworkManagerMockInterface::SetProperty(QString const&, QString const&, QString const&, QDBusVariant const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.2015033174 (c++)"NetworkManagerMockInterface::SetProperty(QString const&, QString const&, QString const&, QDBusVariant const&)::{lambda()#1}::operator()() const::qstring_literal@Base" 0.3+15.04.20150331
72 (c++)"OrgFreedesktopDBusMockInterface::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.175 (c++)"OrgFreedesktopDBusMockInterface::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.1
7376
=== modified file 'debian/rules'
--- debian/rules 2014-03-03 12:47:25 +0000
+++ debian/rules 2015-10-06 11:46:55 +0000
@@ -3,17 +3,5 @@
33
4export DPKG_GENSYMBOLS_CHECK_LEVEL=44export DPKG_GENSYMBOLS_CHECK_LEVEL=4
55
6ifeq ($(DEB_HOST_ARCH),armhf)
7 ENABLE_MEMCHECK_OPTION = OFF
8else
9 ENABLE_MEMCHECK_OPTION = ON
10endif
11
12%:6%:
13 dh $@ --parallel --fail-missing7 dh $@ --parallel --fail-missing
14
15override_dh_auto_configure:
16 dh_auto_configure -- -DENABLE_MEMCHECK_OPTION=${ENABLE_MEMCHECK_OPTION}
17
18override_dh_makeshlibs:
19 dh_makeshlibs -V

Subscribers

People subscribed via source and target branches

to all changes: