d235a87 · unity8 · git.iko.soy

fix failing username and real name tests

commitd235a87588c6b2738381826f39499605260fe842 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 29 Jun 2015, 20:42 (11 years ago) parent5d26443

2 files changed+6−8

unifiedsplit

plugins/Unity/Session/dbusunitysessionservice.cpp+2−2

@@ -241,7 +241,7 @@ bool DBusUnitySessionService::CanLock() const

241241

242242QString DBusUnitySessionService::UserName() const

243243{

244− struct passwd *p = getpwuid(getuid());

244+ struct passwd *p = getpwuid(geteuid());

245245 if (p) {

246246 return QString::fromUtf8(p->pw_name);

247247 }

@@ -251,7 +251,7 @@ QString DBusUnitySessionService::UserName() const

251251

252252QString DBusUnitySessionService::RealName() const

253253{

254− struct passwd *p = getpwuid(getuid());

254+ struct passwd *p = getpwuid(geteuid());

255255 if (p) {

256256 const QString gecos = QString::fromLocal8Bit(p->pw_gecos);

257257 if (!gecos.isEmpty()) {

tests/plugins/Unity/Session/sessionbackendtest.cpp+4−6

@@ -134,14 +134,12 @@ private Q_SLOTS:

134134 QCoreApplication::processEvents(); // to let the service register on DBus

135135

136136 QDBusInterface accIface("org.freedesktop.Accounts", "/org/freedesktop/Accounts", "org.freedesktop.Accounts", QDBusConnection::systemBus());

137− QVERIFY(accIface.isValid());

137+ QTRY_VERIFY(accIface.isValid());

138138 QDBusReply<QDBusObjectPath> userPath = accIface.asyncCall("FindUserById", static_cast<qint64>(geteuid()));

139− if (!userPath.isValid()) {

140− QFAIL("Could not get user path in Account Service");

139+ if (userPath.isValid()) {

140+ QDBusInterface userAccIface("org.freedesktop.Accounts", userPath.value().path(), "org.freedesktop.Accounts.User", QDBusConnection::systemBus());

141+ QTRY_COMPARE(dbusUnitySessionService.RealName(), userAccIface.property("RealName").toString());

141142 }

142−

143− QDBusInterface userAccIface("org.freedesktop.Accounts", userPath.value().path(), "org.freedesktop.Accounts.User", QDBusConnection::systemBus());

144− QCOMPARE(dbusUnitySessionService.RealName(), userAccIface.property("RealName").toString());

145143 }

146144

147145 void testLogin1Capabilities() {