Unity 8

Merge lp:~lukas-kde/unity8/fixLogin1Tests into lp:unity8

fixLogin1Tests
Merge into trunk

Proposed by Lukáš Tinkl on 2015-09-25

Status:	Work in progress
Proposed branch:	lp:~lukas-kde/unity8/fixLogin1Tests
Merge into:	lp:unity8
Diff against target:	319 lines (+131/-30) 5 files modified debian/control (+2/-1) plugins/Unity/Session/CMakeLists.txt (+2/-0) plugins/Unity/Session/dbusunitysessionservice.cpp (+12/-12) tests/plugins/Unity/Session/CMakeLists.txt (+1/-1) tests/plugins/Unity/Session/sessionbackendtest.cpp (+114/-16)
To merge this branch:	bzr merge lp:~lukas-kde/unity8/fixLogin1Tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Needs Information on 2016-01-12
Josh Arenson		2015-09-25	Needs Information on 2015-10-27
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-10-26
Michał Sawicz			Abstain on 2015-09-29
Review via email: mp+272493@code.launchpad.net

Commit Message

Extend the sessionBackendTest with methods testing also the mock dbus interfaces

Description of the Change

Extend the sessionBackendTest with methods testing also the mock dbus interfaces (org.freedesktop.login1 and org.gnome.ScreenSaver) created by python-dbusmock helpers.

Fix the testLogin1Capabilities to use data-driven testing.

* Are there any related MPs required for this MP to build/function as expected? Please list.

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

N/A

PS Jenkins bot (ps-jenkins) wrote on 2015-09-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6356/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2015-09-29:

Text conflict in plugins/Unity/Session/dbusunitysessionservice.cpp
1 conflicts encountered.

review: Needs Fixing

lp:~lukas-kde/unity8/fixLogin1Tests updated on 2015-09-29

1977. By Lukáš Tinkl on 2015-09-29: merge trunk and fix conflicts

Lukáš Tinkl (lukas-kde) wrote on 2015-09-29:

> Text conflict in plugins/Unity/Session/dbusunitysessionservice.cpp
> 1 conflicts encountered.

Fixed

Michał Sawicz (saviq) on 2015-09-29:

review: Abstain

PS Jenkins bot (ps-jenkins) wrote on 2015-09-29:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6372/rebuild

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2015-09-29:

1 small change (inline). Else, looks good for now. The qmltest failure seems CI related, but another run would be nice to see.

review: Needs Fixing

Lukáš Tinkl (lukas-kde) wrote on 2015-09-29:

Saviq advised me to make it a build dep; I will put it in place alphabetically

lp:~lukas-kde/unity8/fixLogin1Tests updated on 2015-09-29

1978. By Lukáš Tinkl on 2015-09-29: put the python-dbusmock dep in place alphabetically

Michał Sawicz (saviq) wrote on 2015-09-29:

W dniu 29.09.2015 o 17:51, Lukáš Tinkl pisze:
> Not technically a build dep but it's neither a runtime dep :)

It is a build dep because it's needed for tests that run during package
building.

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6383/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6386/rebuild

review: Needs Fixing (continuous-integration)

Francis Ginther (fginther) wrote on 2015-10-01:

I took a look at the QML test issue. The build is failing because there are processes still active when the build tries to exit the pbuilder chroot. On a rerun of this I found:

ubuntu@ps-wily-ps-wily-server-amd64-1:/var/cache/pbuilder/build$ sudo lsof 5058
stat() fuse.gvfsd-fuse file system /run/user/1000/gvfs
information may be incomplete.
TYPE DEVICE SIZE/OFF NODE NAME
4096 393622 5058
4096 393622 5058
4096 393622 5058
4096 393622 5058
/>server-amd64-1:/var/cache/pbuilder/build$ ps -ef|grep dbus
00:00:00 /usr/bin/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation
00:00:00 /usr/bin/dbus-launch --autolaunch 024226a659a4bd8ca13eea115550c33b --binary-syntax --close-stderr
00:00:00 /usr/bin/dbus-daemon --fork --print-pid 5 --print-address 7 --session
00:00:00 /usr/bin/dbus-daemon --config-file=/etc/at-spi2/accessibility.conf --nofork --print-address 3
00:00:00 /usr/bin/ssh-agent /usr/bin/dbus-launch --exit-with-session /usr/bin/im-launch /home/ubuntu/.xsession
00:00:00 /usr/bin/dbus-launch --exit-with-session /usr/bin/im-launch /home/ubuntu/.xsession
00:00:00 /usr/bin/dbus-daemon --fork --print-pid 5 --print-address 7 --session
00:00:00 /usr/bin/dbus-daemon --config-file=/etc/at-spi2/accessibility.conf --nofork --print-address 3
00:00:00 dbus-launch --autolaunch 024226a659a4bd8ca13eea115550c33b --binary-syntax --close-stderr
00:00:00 /usr/bin/dbus-daemon --fork --print-pid 5 --print-address 7 --session
00:00:00 dbus-launch --autolaunch=b3438f151772a1f0748771fb467c882c --binary-syntax --close-stderr
00:00:00 /usr/bin/dbus-daemon --fork --print-pid 5 --print-address 7 --session
00:00:00 grep --color=auto dbus

lp:~lukas-kde/unity8/fixLogin1Tests updated on 2015-10-14

1979. By Lukáš Tinkl on 2015-10-14: kill the DBUS processes in ordeer not to hog up the test runner

PS Jenkins bot (ps-jenkins) wrote on 2015-10-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6472/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/fixLogin1Tests updated on 2015-10-19

1980. By Lukáš Tinkl on 2015-10-19: merge trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-10-20:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6493/rebuild

review: Needs Fixing (continuous-integration)

lp:~lukas-kde/unity8/fixLogin1Tests updated on 2015-10-26

1981. By Lukáš Tinkl on 2015-10-26: merge trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-10-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6540/rebuild

review: Needs Fixing (continuous-integration)

Josh Arenson (josharenson) wrote on 2015-10-27:

1 comment inline

review: Needs Information

Albert Astals Cid (aacid) wrote on 2015-11-20:

Text conflict in plugins/Unity/Session/dbusunitysessionservice.cpp
1 conflicts encountered.

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2016-01-12:

> add_definitions(-DSM_BUSNAME=systemBus)

What's the use of this? It doesn't get defined to anything else elsewhere, no?

review: Needs Information

Unmerged revisions

1981. By Lukáš Tinkl on 2015-10-26

merge trunk

1980. By Lukáš Tinkl on 2015-10-19

merge trunk

1979. By Lukáš Tinkl on 2015-10-14

kill the DBUS processes in ordeer not to hog up the test runner

1978. By Lukáš Tinkl on 2015-09-29

put the python-dbusmock dep in place alphabetically

1977. By Lukáš Tinkl on 2015-09-29

merge trunk and fix conflicts

1976. By Lukáš Tinkl on 2015-09-25

add a build dep on python3-dbusmock

1975. By Lukáš Tinkl on 2015-09-25

test the gnome screensaver mock

1974. By Lukáš Tinkl on 2015-09-25

test logind mock

1973. By Lukáš Tinkl on 2015-09-24

use metaObject and invokeMethod instead of if/else branches

1972. By Lukáš Tinkl on 2015-09-24

create the DUSS service on either session/system bus depending on the testing status;

test login1 DBUS iface using a mock on session bus

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/control'
 --- debian/control	2015-10-21 11:51:11 +0000
 +++ debian/control	2015-10-26 12:59:07 +0000
@@ -34,6 +34,7 @@
                 libxcb1-dev,
                 pkg-config,
                 python3-all:any,
++               python3-dbusmock,
                 python3-setuptools,
                 qml-module-qt-labs-folderlistmodel,
                 qml-module-qtquick-layouts,
@@ -54,7 +55,7 @@
                 qtdeclarative5-ubuntu-web-plugin,
                 ttf-ubuntu-font-family,
  Standards-Version: 3.9.4
--Homepage: http://launchpad.net/unity
++Homepage: http://launchpad.net/unity8
  # 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.
 === modified file 'plugins/Unity/Session/CMakeLists.txt'
 --- plugins/Unity/Session/CMakeLists.txt	2015-06-18 16:06:44 +0000
 +++ plugins/Unity/Session/CMakeLists.txt	2015-10-26 12:59:07 +0000
@@ -7,6 +7,8 @@
      ${libunity8-private_SOURCE_DIR}
+ )
++add_definitions(-DSM_BUSNAME=systemBus)
++
  set(QMLSESSIONPLUGIN_SRC
      plugin.cpp
      dbusunitysessionservice.cpp
 === modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
 --- plugins/Unity/Session/dbusunitysessionservice.cpp	2015-09-29 12:45:19 +0000
 +++ plugins/Unity/Session/dbusunitysessionservice.cpp	2015-10-26 12:59:07 +0000
@@ -61,18 +61,18 @@
                                                            QStringLiteral("GetSessionByPID"));
          msg << (quint32) getpid();
--        QDBusReply<QDBusObjectPath> reply = QDBusConnection::systemBus().asyncCall(msg);
++        QDBusReply<QDBusObjectPath> reply = QDBusConnection::SM_BUSNAME().asyncCall(msg);
          if (reply.isValid()) {
              logindSessionPath = reply.value().path();
              // start watching the Active property
--            QDBusConnection::systemBus().connect(LOGIN1_SERVICE, logindSessionPath, QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("PropertiesChanged"),
++            QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, logindSessionPath, QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("PropertiesChanged"),
                                                   this, SLOT(onPropertiesChanged(QString,QVariantMap,QStringList)));
              setupSystemdInhibition();
              // re-enable the inhibition upon resume from sleep
--            QDBusConnection::systemBus().connect(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, QStringLiteral("PrepareForSleep"),
++            QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, QStringLiteral("PrepareForSleep"),
                                                   this, SLOT(onResuming(bool)));
          } else {
              qWarning() << "Failed to get logind session path" << reply.error().message();
@@ -92,7 +92,7 @@
          msg << "Unity"; // who
          msg << "Unity8 handles power events"; // why
          msg << "block"; // mode
--        QDBusReply<QDBusUnixFileDescriptor> desc = QDBusConnection::systemBus().asyncCall(msg);
++        QDBusReply<QDBusUnixFileDescriptor> desc = QDBusConnection::SM_BUSNAME().asyncCall(msg);
          if (desc.isValid()) {
              m_systemdInhibitFd = desc.value();
@@ -105,7 +105,7 @@
      bool checkLogin1Call(const QString &method) const
+     {
          QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, method);
--        QDBusReply<QString> reply = QDBusConnection::systemBus().asyncCall(msg);
++        QDBusReply<QString> reply = QDBusConnection::SM_BUSNAME().asyncCall(msg);
          return reply.isValid() && (reply == QStringLiteral("yes") || reply == QStringLiteral("challenge"));
+     }
@@ -116,7 +116,7 @@
                                                            LOGIN1_IFACE,
                                                            method);
          msg.setArguments(args);
--        QDBusConnection::systemBus().asyncCall(msg);
++        QDBusConnection::SM_BUSNAME().asyncCall(msg);
+     }
      void checkActive()
@@ -133,7 +133,7 @@
          msg << LOGIN1_SESSION_IFACE;
          msg << ACTIVE_KEY;
--        QDBusReply<QVariant> reply = QDBusConnection::systemBus().asyncCall(msg);
++        QDBusReply<QVariant> reply = QDBusConnection::SM_BUSNAME().asyncCall(msg);
          if (reply.isValid()) {
              isSessionActive = reply.value().toBool();
          } else {
@@ -159,7 +159,7 @@
          msg << LOGIN1_SESSION_IFACE;
          msg << IDLE_SINCE_KEY;
--        QDBusReply<QVariant> reply = QDBusConnection::systemBus().asyncCall(msg);
++        QDBusReply<QVariant> reply = QDBusConnection::SM_BUSNAME().asyncCall(msg);
          if (reply.isValid()) {
              return reply.value().value<quint64>();
          } else {
@@ -176,7 +176,7 @@
                                                            LOGIN1_SESSION_IFACE,
                                                            QStringLiteral("SetIdleHint"));
          msg << idle;
--        QDBusConnection::systemBus().asyncCall(msg);
++        QDBusConnection::SM_BUSNAME().asyncCall(msg);
+     }
  private Q_SLOTS:
@@ -221,10 +221,10 @@
+ {
      if (!d->logindSessionPath.isEmpty()) {
          // connect our Lock() slot to the logind's session Lock() signal
--        QDBusConnection::systemBus().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Lock"), this, SLOT(Lock()));
++        QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Lock"), this, SLOT(Lock()));
          // ... and our Unlocked() signal to the logind's session Unlock() signal
          // (lightdm handles the unlocking by calling logind's Unlock method which in turn emits this signal we connect to)
--        QDBusConnection::systemBus().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Unlock"), this, SIGNAL(Unlocked()));
++        QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Unlock"), this, SIGNAL(Unlocked()));
      } else {
          qWarning() << "Failed to connect to logind's session Lock/Unlock signals";
+     }
@@ -325,7 +325,7 @@
                                                        sessionPath,
                                                        QStringLiteral("org.freedesktop.DisplayManager.Session"),
                                                        QStringLiteral("Lock"));
--    QDBusReply<void> reply = QDBusConnection::systemBus().asyncCall(msg);
++    QDBusReply<void> reply = QDBusConnection::SM_BUSNAME().asyncCall(msg);
      if (!reply.isValid()) {
          qWarning() << "Lock call failed" << reply.error().message();
      } else {
 === modified file 'tests/plugins/Unity/Session/CMakeLists.txt'
 --- tests/plugins/Unity/Session/CMakeLists.txt	2015-06-29 14:53:02 +0000
 +++ tests/plugins/Unity/Session/CMakeLists.txt	2015-10-26 12:59:07 +0000
@@ -16,7 +16,7 @@
  target_link_libraries(sessionbackendtestExec
      unity8-private
+     )
--qt5_use_modules(sessionbackendtestExec Test Core Qml DBus)
++qt5_use_modules(sessionbackendtestExec Test Core DBus)
  add_unity8_unittest(SessionBackend dbus-test-runner
      ARG_PREFIX "--parameter"
 === modified file 'tests/plugins/Unity/Session/sessionbackendtest.cpp'
 --- tests/plugins/Unity/Session/sessionbackendtest.cpp	2015-06-30 03:45:36 +0000
 +++ tests/plugins/Unity/Session/sessionbackendtest.cpp	2015-10-26 12:59:07 +0000
@@ -12,10 +12,6 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *      Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>
-- *      Lukáš Tinkl <lukas.tinkl@canonical.com>
   */
  #include <QtTest>
@@ -50,10 +46,55 @@
          dbusUnitySession = new QDBusInterface ("com.canonical.Unity",
                                                 "/com/canonical/Unity/Session",
                                                 "com.canonical.Unity.Session",
--                                               QDBusConnection::sessionBus());
--    }
--
--    void testUnitySessionLogoutRequested_data() {
++                                               QDBusConnection::sessionBus(), this);
++
++        // logind mock
++        m_fakeLogindServer = new QProcess;
++        m_fakeLogindServer->start("python3 -m dbusmock org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager");
++        m_fakeLogindServer->waitForStarted();
++        qDebug() << "Logind DBUS mock started with pid:" << m_fakeLogindServer->processId();
++
++        m_logindMockIface = new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.DBus.Mock",
++                                               QDBusConnection::sessionBus(), this);
++        QTRY_VERIFY(m_logindMockIface->isValid());
++
++        m_logindMockIface->call("AddTemplate", "logind", QVariant::fromValue(QVariantMap())); // load the logind template, no params
++
++        // add a fake session to make DBusUnitySessionService happy
++        QDBusReply<QString> fakeSession = m_logindMockIface->call("AddSession", "fakesession", "fakeseat", (quint32) getuid(),
++                                                                  "fakeuser", true);
++
++        qDebug() << "Using a fake login1 session:" << fakeSession;
++
++        if (!fakeSession.isValid()) {
++            qWarning() << "Fake session error:" << fakeSession.error().name() << ":" << fakeSession.error().message();
++            QFAIL("Fake session could not be found");
++        }
++        m_logindMockIface->call("AddMethod", "org.freedesktop.login1.Manager", "GetSessionByPID", "u", "o",
++                                QStringLiteral("ret='%1'").arg(fakeSession)); // let DBUSS find the fake session to operate on
++
++        // gnome screensaver mock
++        m_fakeGnomeScreensaverServer = new QProcess;
++        m_fakeGnomeScreensaverServer->start("python3 -m dbusmock org.gnome.ScreenSaver /org/gnome/ScreenSaver org.gnome.ScreenSaver");
++        m_fakeGnomeScreensaverServer->waitForStarted();
++        qDebug() << "Gnome screensaver DBUS mock started with pid:" << m_fakeGnomeScreensaverServer->processId();
++
++        m_gnomeScreensaverMockIface = new QDBusInterface("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver", "org.freedesktop.DBus.Mock",
++                                                         QDBusConnection::sessionBus(), this);
++        QTRY_VERIFY(m_gnomeScreensaverMockIface->isValid());
++
++        m_gnomeScreensaverMockIface->call("AddTemplate", "gnome_screensaver", QVariant::fromValue(QVariantMap())); // load the gnome ss template, no params
++    }
++
++    void cleanupTestCase() {
++        m_fakeLogindServer->kill();
++        delete m_fakeLogindServer;
++
++        m_fakeGnomeScreensaverServer->kill();
++        delete m_fakeGnomeScreensaverServer;
++    }
++
++    void testUnitySessionService_data() {
          QTest::addColumn<QString>("method");
          QTest::addColumn<QString>("signal");
@@ -63,7 +104,7 @@
          QTest::newRow("PromptLock") << "PromptLock" << "LockRequested()";
+     }
--    void testUnitySessionLogoutRequested() {
++    void testUnitySessionService() {
          QFETCH(QString, method);
          QFETCH(QString, signal);
@@ -148,22 +189,79 @@
+         }
+     }
++    void testLogin1Capabilities_data() {
++        QTest::addColumn<QString>("dbusMethod"); // dbus method on the login1 iface
++        QTest::addColumn<QString>("method");     // our method
++
++        QTest::newRow("CanHibernate") << "CanHibernate" << "CanHibernate";
++        QTest::newRow("CanSuspend") << "CanSuspend" << "CanSuspend";
++        QTest::newRow("CanReboot") << "CanReboot" << "CanReboot";
++        QTest::newRow("CanPowerOff") << "CanPowerOff" << "CanShutdown";
++        QTest::newRow("CanHybridSleep") << "CanHybridSleep" << "CanHybridSleep";
++    }
++
      void testLogin1Capabilities() {
++        QFETCH(QString, dbusMethod);
++        QFETCH(QString, method);
++
          DBusUnitySessionService dbusUnitySessionService;
--        QDBusInterface login1face("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus());
++        QDBusInterface login1face("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::SM_BUSNAME());
          QCoreApplication::processEvents(); // to let the services register on DBus
--        if (login1face.isValid()) {
--            QCOMPARE(dbusUnitySessionService.CanHibernate(), (login1face.call("CanHibernate").arguments().first().toString() != "no"));
--            QCOMPARE(dbusUnitySessionService.CanSuspend(), (login1face.call("CanSuspend").arguments().first().toString() != "no"));
--            QCOMPARE(dbusUnitySessionService.CanReboot(), (login1face.call("CanReboot").arguments().first().toString() != "no"));
--            QCOMPARE(dbusUnitySessionService.CanShutdown(), (login1face.call("CanPowerOff").arguments().first().toString() != "no"));
--            QCOMPARE(dbusUnitySessionService.CanHybridSleep(), (login1face.call("CanHybridSleep").arguments().first().toString() != "no"));
++        QDBusReply<QString> dbusReply = login1face.call(dbusMethod);
++        bool reply;
++        dbusUnitySessionService.metaObject()->invokeMethod(&dbusUnitySessionService, qPrintable(method), Q_RETURN_ARG(bool, reply));
++        QCOMPARE(reply, (dbusReply == "yes" || dbusReply == "challenge"));
++    }
++
++    void testLogindMock_data() {
++        QTest::addColumn<QString>("method"); // dbus method on the login1 iface
++
++        QTest::newRow("CanHibernate") << "CanHibernate";
++        QTest::newRow("CanSuspend") << "CanSuspend";
++        QTest::newRow("CanReboot") << "CanReboot";
++        QTest::newRow("CanPowerOff") << "CanPowerOff";
++        QTest::newRow("CanHybridSleep") << "CanHybridSleep";
++    }
++
++    void testLogindMock() {
++        QFETCH(QString, method);
++
++        const QStringList replies = {"yes", "no", "na", "challenge"};
++
++        Q_FOREACH(const QString &reply, replies) {
++            m_logindMockIface->call("AddMethod", "org.freedesktop.login1.Manager", method, "", "s",
++                                    QStringLiteral("ret='%1'").arg(reply));
++
++            QDBusInterface login1face("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::SM_BUSNAME());
++            QCoreApplication::processEvents(); // to let the services register on DBus
++
++            QDBusReply<QString> dbusReply = login1face.call(method);
++
++            QCOMPARE(dbusReply.value(), reply);
+         }
+     }
++    void testGnomeScreenSaverMock() {
++        QDBusInterface gnomeSaverIface("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver", "org.gnome.ScreenSaver",
++                                       QDBusConnection::sessionBus(), this);
++        QCoreApplication::processEvents(); // to let the service register on DBus
++
++        gnomeSaverIface.call("Lock");
++
++        QDBusReply<bool> isActive = gnomeSaverIface.call("GetActive");
++
++        QTRY_VERIFY(isActive.value()); // verify it's active (locked)
++    }
++
  private:
      QDBusInterface *dbusUnitySession;
++
++    QProcess *m_fakeLogindServer = nullptr;
++    QDBusInterface *m_logindMockIface = nullptr;
++
++    QProcess *m_fakeGnomeScreensaverServer = nullptr;
++    QDBusInterface *m_gnomeScreensaverMockIface = nullptr;
  };
  QTEST_GUILESS_MAIN(SessionBackendTest)