Unity 8

Merge lp:~mterry/unity8/greeter-mock-bg into lp:unity8

greeter-mock-bg
Merge into trunk

Proposed by Michael Terry on 2016-08-11

Status:	Merged
Approved by:	Albert Astals Cid on 2016-08-24
Approved revision:	2559
Merged at revision:	2632
Proposed branch:	lp:~mterry/unity8/greeter-mock-bg
Merge into:	lp:unity8
Prerequisite:	lp:~mterry/unity8/greeter-apps
Diff against target:	333 lines (+79/-33) 11 files modified debian/rules (+3/-2) tests/CMakeLists.txt (+7/-12) tests/mocks/AccountsService/AccountsService.cpp (+19/-3) tests/mocks/AccountsService/AccountsService.h (+3/-0) tests/mocks/AccountsService/CMakeLists.txt (+14/-0) tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp (+5/-0) tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h (+2/-0) tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp (+14/-1) tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt (+0/-3) tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp (+2/-2) tests/qmltests/CMakeLists.txt (+10/-10)
To merge this branch:	bzr merge lp:~mterry/unity8/greeter-mock-bg
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)			Approve on 2016-08-24
Unity8 CI Bot	continuous-integration	2016-08-11	Needs Fixing on 2016-08-22
Daniel d'Andrada		2016-08-11	Pending
Review via email: mp+302695@code.launchpad.net

This proposal supersedes a proposal from 2016-08-04.

Commit Message

Fix tryShell to actually show appropriate backgrounds for each mock user.

Description of the Change

This only affects the mocks. Backgrounds are pulled from AccountsService, but the data is set in liblightdm. Previously, they weren't connected.

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

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

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

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

Daniel d'Andrada (dandrader) wrote on 2016-08-04: Posted in a previous version of this proposal

* Did you perform an exploratory manual test run of the code change and any related functionality?
Works fine in "make tryShell"

* Did CI run pass? If not, please explain why.
No results yet.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-04: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1882/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-08-04: Posted in a previous version of this proposal

Whoops, updated debian/rules to match changes, so the debuild succeeds.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-04: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1888/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-05: Posted in a previous version of this proposal

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1895/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-08-11:

I've rebased on greeter-apps, just to help keep my set of branches consistent.

If CI doesn't seem borked, I'll mark as approved, since this got approval before.

lp:~mterry/unity8/greeter-mock-bg updated on 2016-08-11

2557. By Michael Terry on 2016-08-11: Merge greeter-apps

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-11:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1943/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-11:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1947/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-17:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1968/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-mock-bg updated on 2016-08-22

2558. By Michael Terry on 2016-08-22: Just always link to mock liblightdm, especially now that our mock AS module needs it

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-22:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1996/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/greeter-mock-bg updated on 2016-08-22

2559. By Michael Terry on 2016-08-22: Don't set mock backgrounds if none exist

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-22:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2007/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-08-24:

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

* Did CI run pass? If not, please explain why.
Yes except known unrelated unstable tests.

review: Approve

lp:~mterry/unity8/greeter-mock-bg updated on 2016-09-06

2560. By Michael Terry on 2016-08-30: Merge greeter-apps
2561. By Michael Terry on 2016-09-06: Merge greeter-apps

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:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'debian/rules'
2	--- debian/rules 2016-06-20 14:56:40 +0000
3	+++ debian/rules 2016-09-06 13:51:33 +0000
4	@@ -37,6 +37,7 @@
5	override_dh_makeshlibs:
6	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
7
8	-# libMockLightDM-qml.so links against liblightdm-qt5-3.so which doesn't exist
9	override_dh_shlibdeps:
10	- dh_shlibdeps -XlibMockLightDM-qml.so
11	+ # Some mock libraries link against liblightdm-qt5-3.so which we want to
12	+ # avoid, since we only really link against our mock one, not the system one.
13	+ dh_shlibdeps -XlibMockLightDM-qml.so -XlibMockAccountsService-qml.so
14
15	=== modified file 'tests/CMakeLists.txt'
16	--- tests/CMakeLists.txt 2016-06-29 14:44:41 +0000
17	+++ tests/CMakeLists.txt 2016-09-06 13:51:33 +0000
18	@@ -37,27 +37,22 @@
19
20	macro(unity8_parse_arguments)
21	cmake_parse_arguments(U8TEST
22	- "${QMLTEST_OPTIONS};LIGHTDM"
23	+ "${QMLTEST_OPTIONS}"
24	"${QMLTEST_SINGLE}"
25	"${QMLTEST_MULTI}"
26	${ARGN}
27	)
28
29	set(ld_paths)
30	- if(U8TEST_LIGHTDM)
31	- list(APPEND ld_paths
32	- ${UNITY_MOCKPATH}/libusermetrics
33	- ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
34	- )
35	- endif()
36	+ list(APPEND ld_paths
37	+ ${UNITY_MOCKPATH}/libusermetrics
38	+ ${UNITY_MOCKPATH}/LightDM/IntegratedLightDM/liblightdm
39	+ )
40
41	- if(ld_paths)
42	- string(REPLACE ";" ":" ld_library_path "${ld_paths}")
43	- set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
44	- endif()
45	+ string(REPLACE ";" ":" ld_library_path "${ld_paths}")
46	+ set(ld_library_path LD_LIBRARY_PATH=${ld_library_path})
47
48	set(U8TEST_ARGN "${ARGN}")
49	- list(REMOVE_ITEM U8TEST_ARGN LIGHTDM)
50
51	set(environment
52	UNITY_TESTING=1
53
54	=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
55	--- tests/mocks/AccountsService/AccountsService.cpp 2016-06-20 15:24:27 +0000
56	+++ tests/mocks/AccountsService/AccountsService.cpp 2016-09-06 13:51:33 +0000
57	@@ -15,7 +15,9 @@
58	*/
59
60	#include "AccountsService.h"
61	+#include "MockUsersModel.h"
62
63	+#include <QLightDM/UsersModel>
64	#include <paths.h>
65
66	AccountsService::AccountsService(QObject* parent)
67	@@ -23,15 +25,17 @@
68	m_enableFingerprintIdentification(true),
69	m_enableLauncherWhileLocked(true),
70	m_enableIndicatorsWhileLocked(true),
71	- m_backgroundFile(qmlDirectory() + "/graphics/phone_background.jpg"),
72	+ m_backgroundFile(),
73	m_statsWelcomeScreen(true),
74	m_failedLogins(0),
75	m_failedFingerprintLogins(0),
76	m_demoEdges(false),
77	m_demoEdgesCompleted(),
78	m_hereEnabled(false),
79	- m_hereLicensePath("")
80	+ m_hereLicensePath(""),
81	+ m_usersModel(new MockUsersModel(this))
82	{
83	+ m_usersModel->setMockMode("full");
84	}
85
86	QString AccountsService::user() const
87	@@ -44,6 +48,7 @@
88	m_user = user;
89	Q_EMIT userChanged();
90	Q_EMIT passwordDisplayHintChanged();
91	+ Q_EMIT backgroundFileChanged();
92	}
93
94	bool AccountsService::demoEdges() const
95	@@ -111,7 +116,18 @@
96
97	QString AccountsService::backgroundFile() const
98	{
99	- return m_backgroundFile;
100	+ if (!m_backgroundFile.isEmpty()) {
101	+ return m_backgroundFile;
102	+ }
103	+
104	+ // Check if our mock user has a background set in liblightdm
105	+ for (int i = 0; i < m_usersModel->count(); i++) {
106	+ if (m_usersModel->data(i, QLightDM::UsersModel::NameRole) == m_user) {
107	+ return m_usersModel->data(i, QLightDM::UsersModel::BackgroundPathRole).toString();
108	+ }
109	+ }
110	+
111	+ return QString();
112	}
113
114	void AccountsService::setBackgroundFile(const QString &backgroundFile)
115
116	=== modified file 'tests/mocks/AccountsService/AccountsService.h'
117	--- tests/mocks/AccountsService/AccountsService.h 2016-06-30 22:42:32 +0000
118	+++ tests/mocks/AccountsService/AccountsService.h 2016-09-06 13:51:33 +0000
119	@@ -22,6 +22,8 @@
120	#include <QStringList>
121	#include <QVariant>
122
123	+class MockUsersModel;
124	+
125	class AccountsService: public QObject
126	{
127	Q_OBJECT
128	@@ -163,6 +165,7 @@
129	QString m_realName;
130	QStringList m_kbdMap;
131	QString m_email;
132	+ MockUsersModel *m_usersModel;
133	};
134
135	#endif
136
137	=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
138	--- tests/mocks/AccountsService/CMakeLists.txt 2014-07-02 16:17:14 +0000
139	+++ tests/mocks/AccountsService/CMakeLists.txt 2016-09-06 13:51:33 +0000
140	@@ -1,10 +1,24 @@
141	+include_directories(
142	+ ${CMAKE_CURRENT_BINARY_DIR}
143	+ ${CMAKE_SOURCE_DIR}/plugins/LightDM
144	+ ${CMAKE_SOURCE_DIR}/plugins/Utils
145	+ ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM
146	+ )
147	+
148	add_library(MockAccountsService-qml MODULE
149	+ ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
150	+ ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
151	+ ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp
152	AccountsService.cpp
153	plugin.cpp
154	)
155
156	qt5_use_modules(MockAccountsService-qml DBus Qml)
157
158	+target_link_libraries(MockAccountsService-qml
159	+ MockLightDM
160	+ )
161	+
162	add_unity8_mock(AccountsService 0.1 AccountsService
163	PREFIX mocks
164	TARGETS MockAccountsService-qml
165
166	=== modified file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp'
167	--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp 2015-09-25 13:01:00 +0000
168	+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.cpp 2016-09-06 13:51:33 +0000
169	@@ -19,6 +19,11 @@
170	#include <QLightDM/UsersModel>
171	#include <QSortFilterProxyModel>
172
173	+MockUsersModel::MockUsersModel(QObject* parent)
174	+ : UsersModel(parent)
175	+{
176	+}
177	+
178	QString MockUsersModel::mockMode() const
179	{
180	QLightDM::UsersModel* qUsersModel =
181
182	=== modified file 'tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h'
183	--- tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h 2015-09-25 13:01:00 +0000
184	+++ tests/mocks/LightDM/IntegratedLightDM/MockUsersModel.h 2016-09-06 13:51:33 +0000
185	@@ -27,6 +27,8 @@
186	Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
187
188	public:
189	+ explicit MockUsersModel(QObject* parent=0);
190	+
191	QString mockMode() const;
192	void setMockMode(QString mockMode);
193
194
195	=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
196	--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp 2016-06-30 15:49:16 +0000
197	+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp 2016-09-06 13:51:33 +0000
198	@@ -17,6 +17,8 @@
199	#include "UsersModelPrivate.h"
200	#include "UsersModel.h"
201
202	+#include <QDir>
203	+
204	namespace QLightDM
205	{
206
207	@@ -53,6 +55,17 @@
208	entries[i].uid = i + 1;
209	}
210
211	+ // Assign backgrounds
212	+ QDir backgroundDir("/usr/share/backgrounds");
213	+ QStringList backgrounds = backgroundDir.entryList(QDir::Files);
214	+ if (!backgrounds.empty()) {
215	+ for (int i = 0; i < entries.size(); i++) {
216	+ if (entries[i].background.isNull()) {
217	+ entries[i].background = backgroundDir.filePath(backgrounds[i % backgrounds.size()]);
218	+ }
219	+ }
220	+ }
221	+
222	q->endResetModel();
223	}
224
225	@@ -96,7 +109,7 @@
226	{ "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
227	{ "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
228	{ "long-name", "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
229	- { "color-background", "Color Background", "#dd4814", 0, false, false, "ubuntu", 0 },
230	+ { "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
231	// white and black are a bit redundant, but useful for manually testing if UI is still readable
232	{ "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
233	{ "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
234
235	=== modified file 'tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt'
236	--- tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt 2016-05-02 21:46:11 +0000
237	+++ tests/plugins/LightDM/IntegratedLightDM/CMakeLists.txt 2016-09-06 13:51:33 +0000
238	@@ -26,7 +26,6 @@
239	ARGS --task $<TARGET_FILE:GreeterDBusTestExec>
240	DEPENDS MockLightDM
241	IMPORT_PATHS ${UNITY_MOCKPATH}
242	- LIGHTDM
243	)
244
245	add_executable(GreeterPamTestExec
246	@@ -63,7 +62,6 @@
247	add_unity8_uitest(GreeterSessions GreeterSessionsModelTestExec
248	ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
249	DEPENDS MockLightDM
250	- LIGHTDM
251	)
252
253	# UsersModelTest
254	@@ -87,7 +85,6 @@
255	add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec
256	ENVIRONMENT LIBLIGHTDM_MOCK_MODE=full
257	DEPENDS MockLightDM
258	- LIGHTDM
259	)
260
261	add_executable(GreeterIntegratedTestExec
262
263	=== modified file 'tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp'
264	--- tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp 2015-09-28 18:00:44 +0000
265	+++ tests/plugins/LightDM/IntegratedLightDM/usersmodel.cpp 2016-09-06 13:51:33 +0000
266	@@ -59,10 +59,10 @@
267	void testMangleColor()
268	{
269	QString background = getStringValue(sourceModel, "color-background", QLightDM::UsersModel::BackgroundPathRole);
270	- QVERIFY(background == "#dd4814");
271	+ QVERIFY(background == "#E95420");
272
273	background = getStringValue(model, "color-background", QLightDM::UsersModel::BackgroundPathRole);
274	- QVERIFY(background == "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>");
275	+ QVERIFY(background == "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#E95420'/></svg>");
276	}
277
278	void testMangleEmptyName()
279
280	=== modified file 'tests/qmltests/CMakeLists.txt'
281	--- tests/qmltests/CMakeLists.txt 2016-05-20 12:07:53 +0000
282	+++ tests/qmltests/CMakeLists.txt 2016-09-06 13:51:33 +0000
283	@@ -1,14 +1,14 @@
284
285	add_subdirectory(Components)
286
287	-add_unity8_qmltest(. OrientedShell LIGHTDM)
288	+add_unity8_qmltest(. OrientedShell)
289	add_unity8_qmltest(. DisabledScreenNotice)
290	-add_unity8_qmltest(. Shell LIGHTDM)
291	-add_unity8_qmltest(. ShellWithPin LIGHTDM)
292	+add_unity8_qmltest(. Shell)
293	+add_unity8_qmltest(. ShellWithPin)
294	add_unity8_qmltest(. DeviceConfiguration)
295	add_unity8_qmltest(Components Background)
296	add_unity8_qmltest(Components Carousel)
297	-add_unity8_qmltest(Components Dialogs LIGHTDM)
298	+add_unity8_qmltest(Components Dialogs)
299	add_unity8_qmltest(Components DraggingArea)
300	add_unity8_qmltest(Components LazyImage)
301	add_unity8_qmltest(Components Lockscreen)
302	@@ -25,7 +25,7 @@
303	add_unity8_qmltest(Components ZoomableImage)
304	add_unity8_qmltest(Dash Dash)
305	add_unity8_qmltest(Dash DashContent)
306	-add_unity8_qmltest(Dash DashShell LIGHTDM)
307	+add_unity8_qmltest(Dash DashShell)
308	add_unity8_qmltest(Dash Card)
309	add_unity8_qmltest(Dash CardCarousel)
310	add_unity8_qmlbenchmark(Dash CardBenchmark 1000)
311	@@ -66,10 +66,10 @@
312	add_unity8_qmltest(Dash/ScopeSettings ScopeSettingString)
313	add_unity8_qmltest(Dash/ScopeSettings ScopeSettingsWidgetFactory)
314	add_unity8_qmltest(Greeter Clock)
315	-add_unity8_qmltest(Greeter Greeter LIGHTDM)
316	-add_unity8_qmltest(Greeter Infographics LIGHTDM)
317	-add_unity8_qmltest(Greeter NarrowView LIGHTDM)
318	-add_unity8_qmltest(Greeter WideView LIGHTDM)
319	+add_unity8_qmltest(Greeter Greeter)
320	+add_unity8_qmltest(Greeter Infographics)
321	+add_unity8_qmltest(Greeter NarrowView)
322	+add_unity8_qmltest(Greeter WideView)
323	add_unity8_qmltest(Launcher Launcher)
324	add_unity8_qmltest(Notifications Notifications)
325	add_unity8_qmltest(Notifications VisualSnapDecisionsQueue)
326	@@ -94,6 +94,6 @@
327	add_unity8_qmltest(Stages TabletStage)
328	add_unity8_qmltest(Stages WindowResizeArea)
329	add_unity8_qmltest(Stages Splash)
330	-add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
331	+add_unity8_qmltest(Tutorial Tutorial)
332	add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")
333	add_unity8_qmltest(utils/Unity/Test UnityTest)