Merge lp:~pete-woods/libqtdbusmock/new-templates-in-common-package into lp:libqtdbusmock

[Pete Woods]

Add new templates to new -common package

Add new templates to new -common package

[lp:~pete-woods/libqtdbusmock/new-templates-in-common-package]

49. By Pete Woods on 2017-03-16

Remove duplicate property entry

[Xavi Garcia (xavi-garcia-mena)]

Looks good to me, thanks!

Just 1 ultra ultra ultra minor thing that is not going to block approving this:

In...
 #include <NetworkManager.h>
90 #include <QJsonDocument>
91 +#include <QFile>
92 +#include <QStandardPaths>

QFile should go before QJsonDocument if we follow alphabetical order.

review: Approve

[lp:~pete-woods/libqtdbusmock/new-templates-in-common-package]

50. By Pete Woods on 2017-03-16

Remove multiarch and shlibs depends

51. By Pete Woods on 2017-03-16

Fix Xavi's review comment

52. By Pete Woods on 2017-03-16

Improve changelog message

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-12-12 12:02:52 +0000
+++ CMakeLists.txt	2017-03-16 10:30:45 +0000
@@ -59,6 +59,7 @@
 
 add_subdirectory("src")
 add_subdirectory("data")
+add_subdirectory("templates")
 
 enable_testing()
 add_subdirectory(tests)
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-01-06 10:44:45 +0000
+++ debian/changelog	2017-03-16 10:30:45 +0000
@@ -1,3 +1,11 @@
+libqtdbusmock (0.7-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add hostname1 and login1 templates to new binary package
+    libqtdbusmock1-common.
+  * Search /usr/share/libqtdbusmock/templates for templates.
+
+ -- Pete <[e-mail]>  Wed, 15 Mar 2017 18:17:19 +0000
+
 libqtdbusmock (0.6+17.04.20170106-0ubuntu1) zesty; urgency=medium
 
   * Compatibility with unversioned cmake-extras modules (LP: #1563573)
 
=== modified file 'debian/control'
--- debian/control	2016-12-12 12:02:52 +0000
+++ debian/control	2017-03-16 10:30:45 +0000
@@ -12,7 +12,7 @@
                pkg-config,
                python3-dbusmock (>= 0.16),
                qtbase5-dev,
-Standards-Version: 3.9.4
+Standards-Version: 3.9.7
 Homepage: https://launchpad.net/libqtdbustest
 # If you aren't a member of ~unity-team but need to upload packaging changes,
 # just go ahead.  ~unity-team will notice and sync up the code again.
@@ -24,6 +24,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: python3-dbusmock (>= 0.16),
+         libqtdbusmock1-common (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Library for mocking DBus interactions using Qt
@@ -41,3 +42,13 @@
  A simple library for mocking DBus services with a Qt API
  .
  This package contains files that are needed to build.
+
+Package: libqtdbusmock1-common
+Section: libs
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+Description: Library for mocking DBus interactions using Qt
+ A simple library for mocking DBus services with a Qt API
+ .
+ This package contains extra dbusmock templates.
 
=== added file 'debian/libqtdbusmock1-common.install'
--- debian/libqtdbusmock1-common.install	1970-01-01 00:00:00 +0000
+++ debian/libqtdbusmock1-common.install	2017-03-16 10:30:45 +0000
@@ -0,0 +1,1 @@
+usr/share
 
=== modified file 'debian/libqtdbusmock1.symbols'
--- debian/libqtdbusmock1.symbols	2016-12-06 12:09:09 +0000
+++ debian/libqtdbusmock1.symbols	2017-03-16 10:30:45 +0000
@@ -47,6 +47,8 @@
  (c++)"QtDBusMock::DBusMock::registerURfkill(QMap<QString, QVariant> const&)@Base" 0.5+15.10.20151009
  (c++)"QtDBusMock::DBusMock::registerTemplate(QString const&, QString const&, QMap<QString, QVariant> const&, QDBusConnection::BusType)@Base" 0.5+15.10.20151009
  (c++)"QtDBusMock::DBusMock::registerTimeDate(QMap<QString, QVariant> const&)@Base" 0.5+15.10.20151009
+ (c++)"QtDBusMock::DBusMock::registerLogin1(QMap<QString, QVariant> const&)@Base" 0replaceme
+ (c++)"QtDBusMock::DBusMock::registerHostname1(QMap<QString, QVariant> const&)@Base" 0replaceme
  (c++)"QtDBusMock::DBusMock::registerPolicyKit(QMap<QString, QVariant> const&)@Base" 0.5+15.10.20151009
  (c++)"QtDBusMock::DBusMock::registerNetworkManager(QMap<QString, QVariant> const&)@Base" 0.5+15.10.20151009
  (c++)"QtDBusMock::DBusMock::registerGnomeScreensaver(QMap<QString, QVariant> const&)@Base" 0.5+15.10.20151009
 
=== modified file 'src/libqtdbusmock/DBusMock.cpp'
--- src/libqtdbusmock/DBusMock.cpp	2016-11-25 13:35:18 +0000
+++ src/libqtdbusmock/DBusMock.cpp	2017-03-16 10:30:45 +0000
@@ -20,7 +20,9 @@
 #include <libqtdbustest/QProcessDBusService.h>
 
 #include <NetworkManager.h>
+#include <QFile>
 #include <QJsonDocument>
+#include <QStandardPaths>
 
 using namespace QtDBusTest;
 
@@ -84,7 +86,22 @@
                               QDBusConnection::BusType busType) {
 	QStringList arguments;
 	arguments << "-m" << "dbusmock";
-	arguments << "--template" << templateName;
+
+	bool found = false;
+	if (!templateName.contains(QDir::separator())) {
+		auto dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+		for (const auto & dir : dirs) {
+			auto path = QDir(QDir(QDir(dir).filePath("libqtdbusmock")).filePath("templates")).filePath(templateName + ".py");
+			if (QFileInfo::exists(path)) {
+				arguments << "--template" << path;
+				found = true;
+				break;
+			}
+		}
+	}
+	if (!found) {
+		arguments << "--template" << templateName;
+	}
 
 	if (!parameters.isEmpty())
 	{
@@ -155,6 +172,16 @@
 			QDBusConnection::SystemBus);
 }
 
+void DBusMock::registerHostname1(const QVariantMap& parameters) {
+	registerTemplate("org.freedesktop.hostname1", "org.freedesktop.hostname1", parameters,
+			QDBusConnection::SystemBus);
+}
+
+void DBusMock::registerLogin1(const QVariantMap& parameters) {
+	registerTemplate("org.freedesktop.login1", "org.freedesktop.login1", parameters,
+			QDBusConnection::SystemBus);
+}
+
 void DBusMock::registerURfkill() {
 	registerURfkill(QVariantMap());
 }
 
=== modified file 'src/libqtdbusmock/DBusMock.h'
--- src/libqtdbusmock/DBusMock.h	2016-11-25 13:35:18 +0000
+++ src/libqtdbusmock/DBusMock.h	2017-03-16 10:30:45 +0000
@@ -77,6 +77,10 @@
 
 	virtual void registerTimeDate(const QVariantMap& parameters = QVariantMap());
 
+	virtual void registerHostname1(const QVariantMap& parameters = QVariantMap());
+
+	virtual void registerLogin1(const QVariantMap& parameters = QVariantMap());
+
 	virtual void registerURfkill();
 
 	virtual void registerURfkill(const QVariantMap& parameters);
 
=== added directory 'templates'
=== added file 'templates/CMakeLists.txt'
--- templates/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ templates/CMakeLists.txt	2017-03-16 10:30:45 +0000
@@ -0,0 +1,8 @@
+
+install(
+	FILES
+		"org.freedesktop.hostname1.py"
+		"org.freedesktop.login1.py"
+	DESTINATION
+		"${CMAKE_INSTALL_DATADIR}/libqtdbusmock/templates/"
+)
 
=== added file 'templates/org.freedesktop.hostname1.py'
--- templates/org.freedesktop.hostname1.py	1970-01-01 00:00:00 +0000
+++ templates/org.freedesktop.hostname1.py	2017-03-16 10:30:45 +0000
@@ -0,0 +1,53 @@
+'''Hostname1 mock template
+'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+
+__author__ = 'Pete Woods'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2016 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+import dbus
+import uuid
+import binascii
+
+from dbusmock import MOCK_IFACE
+import dbusmock
+
+
+BUS_NAME = 'org.freedesktop.hostname1'
+MAIN_IFACE = 'org.freedesktop.hostname1'
+MAIN_OBJ = '/org/freedesktop/hostname1'
+SYSTEM_BUS = True
+
+
+def load(mock, parameters):
+    mock.AddProperties(MAIN_IFACE, {
+       'Hostname': parameters.get('Hostname', 'my-computer'),
+       'StaticHostname': parameters.get('StaticHostname', 'ubuntu'),
+       'PrettyHostname': parameters.get('PrettyHostname', ''),
+       'IconName': parameters.get('IconName', 'computer-vm'), # e.g. "computer-laptop", "computer-desktop"
+       'Chassis': parameters.get('Chassis', 'vm'), # currently defined set: "desktop", "laptop", "server", "tablet", "handset", "vm" and "container"
+       'Deployment': parameters.get('Deployment', ''),
+       'Location': parameters.get('Location', ''),
+       'KernelName': parameters.get('KernelName', 'Linux'),
+       'KernelRelease': parameters.get('KernelRelease', '4.4.0-53-generic'),
+       'KernelVersion': parameters.get('KernelVersion', '#74-Ubuntu SMP Fri Dec 2 15:59:10 UTC 2016'),
+       'OperatingSystemPrettyName': parameters.get('OperatingSystemPrettyName', 'Ubuntu 16.04.1 LTS'),
+       'OperatingSystemCPEName': parameters.get('OperatingSystemCPEName', ''),
+    })
+
+    mock.AddMethods(MAIN_IFACE, [
+        ('SetHostname', 'sb', '', "ret = self.Set('%s', 'Hostname', args[0])" % MAIN_IFACE),
+        ('SetStaticHostname', 'sb', '', "ret = self.Set('%s', 'StaticHostname', args[0])" % MAIN_IFACE),
+        ('SetPrettyHostname', 'sb', '', "ret = self.Set('%s', 'PrettyHostname', args[0])" % MAIN_IFACE),
+        ('SetIconName', 'sb', '', "ret = self.Set('%s', 'IconName', args[0])" % MAIN_IFACE),
+        ('SetChassis', 'sb', '', "ret = self.Set('%s', 'Chassis', args[0])" % MAIN_IFACE),
+        ('SetDeployment', 'sb', '', "ret = self.Set('%s', 'Deployment', args[0])" % MAIN_IFACE),
+        ('SetLocation', 'sb', '', "ret = self.Set('%s', 'Location', args[0])" % MAIN_IFACE),
+    ])
 
=== added file 'templates/org.freedesktop.login1.py'
--- templates/org.freedesktop.login1.py	1970-01-01 00:00:00 +0000
+++ templates/org.freedesktop.login1.py	2017-03-16 10:30:45 +0000
@@ -0,0 +1,171 @@
+'''Login1 mock template
+'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+
+__author__ = 'Pete Woods'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2017 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+import dbus
+import uuid
+import binascii
+
+from dbusmock import MOCK_IFACE
+import dbusmock
+
+
+BUS_NAME = 'org.freedesktop.login1'
+MAIN_IFACE = 'org.freedesktop.login1.Manager'
+MAIN_OBJ = '/org/freedesktop/login1'
+SYSTEM_BUS = True
+
+SEAT_IFACE = 'org.freedesktop.login1.Seat'
+SEAT_PATH = '/org/freedesktop/login1/seat/'
+
+def load(mock, parameters):
+    mock.seats = {}
+    
+    add_seat(mock, parameters.get('DefaultSeat', {}), True)
+    
+    mock.list_seats = list_seats
+    mock.get_seat = get_seat
+    
+    mock.AddProperties(MAIN_IFACE, {
+        'EnableWallMessages': parameters.get('EnableWallMessages', False),
+        'WallMessage': parameters.get('WallMessage', ''),
+        'NAutoVTs': parameters.get('NAutoVTs', dbus.UInt32(6)),
+        'KillOnlyUsers': parameters.get('KillOnlyUsers', dbus.Array([], signature='s')),
+        'KillExcludeUsers': parameters.get('KillExcludeUsers', dbus.Array(['root'], signature='s')),
+        'KillUserProcesses': parameters.get('KillUserProcesses', False),
+        'RebootToFirmwareSetup': parameters.get('RebootToFirmwareSetup', False),
+        'IdleHint': parameters.get('IdleHint', False),
+        'IdleSinceHint': parameters.get('IdleSinceHint', dbus.UInt64(1489580452083866)),
+        'IdleSinceHintMonotonic': parameters.get('IdleSinceHintMonotonic', dbus.UInt64(8134597164)),
+        'BlockInhibited': parameters.get('BlockInhibited', 'handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch'),
+        'DelayInhibited': parameters.get('DelayInhibited', 'sleep'),
+        'InhibitDelayMaxUSec': parameters.get('InhibitDelayMaxUSec', dbus.UInt64(5000000)),
+        'HandlePowerKey': parameters.get('HandlePowerKey', 'poweroff'),
+        'HandleSuspendKey': parameters.get('HandleSuspendKey', 'suspend'),
+        'HandleHibernateKey': parameters.get('HandleHibernateKey', 'hibernate'),
+        'HandleLidSwitch': parameters.get('HandleLidSwitch', 'suspend'),
+        'HandleLidSwitchDocked': parameters.get('HandleLidSwitchDocked', 'ignore'),
+        'HoldoffTimeoutUSec': parameters.get('HoldoffTimeoutUSec', dbus.UInt64(30000000)),
+        'IdleAction': parameters.get('IdleAction', 'ignore'),
+        'IdleActionUSec': parameters.get('IdleActionUSec', dbus.UInt64(1800000000)),
+        'PreparingForShutdown': parameters.get('PreparingForShutdown', False),
+        'PreparingForSleep': parameters.get('PreparingForSleep', False),
+        'ScheduledShutdown': parameters.get('ScheduledShutdown', dbus.Struct(('', 0), signature='st')),
+        'Docked': parameters.get('Docked', False),
+    })
+
+    mock.AddMethods(MAIN_IFACE, [
+        ('GetSession', 's', 'o', "ret = dbus.ObjectPath('/')"),
+        ('GetSessionByPID', 'u', 'o', "ret = dbus.ObjectPath('/')"),
+        ('GetUser', 'u', 'o', "ret = dbus.ObjectPath('/')"),
+        ('GetUserByPID', 'u', 'o', "ret = dbus.ObjectPath('/')"),
+        ('GetSeat', 's', 'o', "ret = self.get_seat(self, args[0])"),
+
+        ('ListSessions', '', 'a(susso)', ""),
+        ('ListUsers', '', 'a(uso)', ""),
+        ('ListSeats', '', 'a(so)', "ret = self.list_seats(self)"),
+        ('ListInhibitors', '', 'a(ssssuu)', ""),
+
+        ('CreateSession', 'uusssssussbssa(sv)', 'soshusub', ""),
+        ('ReleaseSession', 's', '', ""),
+        ('ActivateSession', 's', '', ""),
+        ('ActivateSessionOnSeat', 'ss', '', ""),
+        ('LockSession', 's', '', ""),
+        ('UnlockSession', 's', '', ""),
+        ('LockSessions', '', '', ""),
+        ('UnlockSessions', '', '', ""),
+        ('KillSession', 'ssi', '', ""),
+        ('KillUser', 'ui', '', ""),
+        ('TerminateSession', 's', '', ""),
+        ('TerminateUser', 'u', '', ""),
+        ('TerminateSeat', 's', '', ""),
+        ('SetUserLinger', 'ubb', '', ""),
+        ('AttachDevice', 'ssb', '', ""),
+        ('FlushDevices', 'b', '', ""),
+        ('PowerOff', 'b', '', ""),
+        ('Reboot', 'b', '', ""),
+        ('Suspend', 'b', '', ""),
+        ('Hibernate', 'b', '', ""),
+        ('HybridSleep', 'b', '', ""),
+        ('CanPowerOff', '', 's', "ret = ''"),
+        ('CanReboot', '', 's', "ret = ''"),
+        ('CanSuspend', '', 's', "ret = ''"),
+        ('CanHibernate', '', 's', "ret = ''"),
+        ('CanHybridSleep', '', 's', "ret = ''"),
+        ('ScheduleShutdown', 'st', '', ""),
+        ('CancelScheduledShutdown', '', 'b', "ret = False"),
+        ('Inhibit', 'ssss', 'h', "ret = ?"),
+        ('CanRebootToFirmwareSetup', '', 's', "ret = ''"),
+        ('SetRebootToFirmwareSetup', 'b', '', ""),
+        ('SetWallMessage', 'sb', '', ""),
+    ])
+
+def add_seat(self, properties, is_self):
+    # find a new name
+    count = 0
+    while True:
+        id = 'seat%d' % count
+        if id not in self.seats:
+            break
+        count += 1
+
+    path = dbus.ObjectPath(SEAT_PATH + id)
+
+    seat_props = {
+        'Id': id,
+        'ActiveSession': properties.get('ActiveSession', dbus.Struct(('c2', '/org/freedesktop/login1/session/c2'), signature='so')),
+        'CanMultiSession': properties.get('CanMultiSession', True),
+        'CanTTY': properties.get('CanTTY', True),
+        'CanGraphical': properties.get('CanGraphical', True),
+        'Sessions': properties.get('Sessions', dbus.Array([('c2', '/org/freedesktop/login1/session/c2')], signature='(so)')),
+        'IdleHint': properties.get('IdleHint', False),
+        'IdleSinceHint': properties.get('IdleSinceHint', dbus.UInt64(1489590854604069)),
+        'IdleSinceHintMonotonic': properties.get('IdleSinceHintMonotonic', dbus.UInt64(18537117367)),
+    }
+
+    seat_methods = [
+        ('Terminate', '', '', ""),
+        ('ActivateSession', 's', '', ""),
+        ('SwitchTo', 'u', '', ""),
+        ('SwitchToNext', '', '', ""),
+        ('SwitchToPrevious', '', '', ""),
+    ]
+
+    self.seats[id] = self.AddObject(path,
+                   SEAT_IFACE,
+                   seat_props,
+                   seat_methods)
+
+    if is_self:
+        self_path = dbus.ObjectPath(SEAT_PATH + 'self')
+        try:
+            self.RemoveObject(self_path)
+        except dbus.exceptions.DBusException:
+            pass
+        self.AddObject(self_path,
+                       SEAT_IFACE,
+                       seat_props,
+                       seat_methods)
+
+    return path
+
+def get_seat(self, id):
+    if id in self.seats:
+        return SEAT_PATH + id
+    raise dbus.exceptions.DBusException()
+
+def list_seats(self):
+    result = dbus.Array([], signature='(so)')
+    for id in self.seats:
+        result.append((id, SEAT_PATH + id))
+    return result