lp:~dandrader/unity8/unifyLightDMMocks

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 1586

Michael Terry: Approve on 2015-01-23

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-01-22

Diff: 3381 lines (+1695/-953)

64 files modified

plugins/LightDM/CMakeLists.txt (+3/-3)
plugins/LightDM/Greeter.cpp (+1/-19)
plugins/LightDM/Greeter.h (+1/-1)
plugins/LightDM/GreeterPrivate.h (+39/-0)
plugins/LightDM/liblightdm/CMakeLists.txt (+37/-0)
plugins/LightDM/liblightdm/Greeter.cpp (+184/-0)
plugins/LightDM/liblightdm/Greeter.h (+112/-0)
plugins/LightDM/liblightdm/GreeterPrivate.cpp (+281/-0)
plugins/LightDM/liblightdm/GreeterPrivate.h (+51/-0)
plugins/LightDM/liblightdm/UsersModel.cpp (+123/-0)
plugins/LightDM/liblightdm/UsersModel.h (+66/-0)
plugins/LightDM/liblightdm/UsersModelPrivate.cpp (+41/-0)
plugins/LightDM/liblightdm/UsersModelPrivate.h (+59/-0)
plugins/Lights/CMakeLists.txt (+0/-2)
plugins/Powerd/CMakeLists.txt (+0/-2)
plugins/Unity/Launcher/CMakeLists.txt (+0/-1)
plugins/Unity/Session/CMakeLists.txt (+0/-2)
plugins/Utils/CMakeLists.txt (+0/-3)
run.sh (+3/-26)
tests/autopilot/unity8/shell/__init__.py (+0/-13)
tests/autopilot/unity8/shell/tests/__init__.py (+8/-11)
tests/autopilot/unity8/shell/tests/test_edges_demo.py (+0/-1)
tests/autopilot/unity8/shell/tests/test_lock_screen.py (+6/-5)
tests/mocks/LightDM/CMakeLists.txt (+8/-9)
tests/mocks/LightDM/MockGreeter.cpp (+35/-0)
tests/mocks/LightDM/MockGreeter.h (+37/-0)
tests/mocks/LightDM/MockUsersModel.cpp (+39/-0)
tests/mocks/LightDM/MockUsersModel.h (+37/-0)
tests/mocks/LightDM/QLightDM/Greeter (+17/-0)
tests/mocks/LightDM/QLightDM/UsersModel (+17/-0)
tests/mocks/LightDM/demo/CMakeLists.txt (+0/-37)
tests/mocks/LightDM/demo/GreeterPrivate.cpp (+0/-281)
tests/mocks/LightDM/demo/UsersModelPrivate.cpp (+0/-41)
tests/mocks/LightDM/full/CMakeLists.txt (+0/-18)
tests/mocks/LightDM/full/GreeterPrivate.cpp (+0/-98)
tests/mocks/LightDM/full/UsersModelPrivate.cpp (+0/-52)
tests/mocks/LightDM/liblightdm/CMakeLists.txt (+18/-0)
tests/mocks/LightDM/liblightdm/Greeter.cpp (+18/-3)
tests/mocks/LightDM/liblightdm/Greeter.h (+7/-0)
tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp (+132/-0)
tests/mocks/LightDM/liblightdm/GreeterPrivate.h (+5/-3)
tests/mocks/LightDM/liblightdm/UsersModel.cpp (+17/-0)
tests/mocks/LightDM/liblightdm/UsersModel.h (+10/-3)
tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp (+104/-0)
tests/mocks/LightDM/liblightdm/UsersModelPrivate.h (+7/-3)
tests/mocks/LightDM/plugin.cpp (+68/-0)
tests/mocks/LightDM/plugin.h (+32/-0)
tests/mocks/LightDM/single-passphrase/CMakeLists.txt (+0/-19)
tests/mocks/LightDM/single-passphrase/GreeterPrivate.cpp (+0/-46)
tests/mocks/LightDM/single-passphrase/UsersModelPrivate.cpp (+0/-33)
tests/mocks/LightDM/single-pin/CMakeLists.txt (+0/-19)
tests/mocks/LightDM/single-pin/GreeterPrivate.cpp (+0/-46)
tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp (+0/-33)
tests/mocks/LightDM/single/CMakeLists.txt (+0/-18)
tests/mocks/LightDM/single/GreeterPrivate.cpp (+0/-46)
tests/mocks/LightDM/single/UsersModelPrivate.cpp (+0/-33)
tests/plugins/LightDM/CMakeLists.txt (+3/-3)
tests/plugins/LightDM/greeter.qml (+5/-0)
tests/qmltests/CMakeLists.txt (+19/-19)
tests/qmltests/Greeter/tst_Infographics.qml (+10/-0)
tests/qmltests/Greeter/tst_MultiGreeter.qml (+11/-0)
tests/qmltests/tst_Shell.qml (+8/-1)
tests/qmltests/tst_ShellWithPin.qml (+8/-0)
tests/qmltests/tst_TabletShell.qml (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1570. By Daniel d'Andrada on 2015-02-03

include(FindPkgConfig) only once, in the root CMakeLists.txt

In order to fix cross compilation

Patch by Saviq

1569. By Daniel d'Andrada on 2015-01-27

Merge trunk

[ Sebastien Bacher ]
* Set text hint property for the messaging menus inline reply widget
  (LP: #1389234)
[ Ying-Chun Liu ]
* Added an initial set of autopilot tests for the display indicator.
[ Nick Dedekind ]
* Removed filtering the indicator model by visibility.
[ Michael Zanetti ]
* fixes left edge drag when in spread
[ Albert Astals Cid ]
* Fix ninja build in a different way The previous one was adding rpath
  to some .so that broke our tests that use LD_LIBRARY_PATH to change
  which one is picked up
[ Leo Arias ]
* Added an initial set of autopilot tests for the display indicator.

1568. By Daniel d'Andrada on 2015-01-22

Just to trigger a new build in Jenkins

1567. By Daniel d'Andrada on 2015-01-22

Merge trunk

[ Michael Terry ]
* Don't show any power dialogs while the screen is off. This is a
  band-aid to avoid the symptom, while we still investigate the source
  of why the screen doesn't turn on (and why we seem to not handle the
  power-button-release event). (LP: #1409003, #1410830)
* Don't refocus the dialer-app when a call is started by the user.
  Because of how qtmir works, this would cause the dialer-app to
  unfocus momentarily, causing interface oddities for the user. (LP:
  #1413065)
[ CI Train Bot ]
* Resync trunk
[ Albert Astals Cid ]
* Build with ninja
* Fixes for Table Preview Widget (LP: #1410420)
[ Michael Zanetti ]
* Add support for earpiece media buttons (LP: #1398427)
* Add a WindowMoveResizeArea and tests for it

1566. By Daniel d'Andrada on 2015-01-21

Update autopilot tests

1565. By Daniel d'Andrada on 2015-01-21

Enable specifying liblightdm mock mode via env var

1564. By Daniel d'Andrada on 2015-01-20

Init mockMode

1563. By Daniel d'Andrada on 2015-01-20

Further clean up of run.sh

1562. By Daniel d'Andrada on 2015-01-20

Update run.sh

1561. By Daniel d'Andrada on 2015-01-20

Unify all liblightdm mocks

Benefits:
- Cleaner tests/qmltests/CMakeLists.txt
- Ability change LightDM fake behavior at runtime, which
  makes it possible to merge several tests, reducing code duplication,
  such as tst_Shell, tst_TabletShell and tst_ShellWithPin.
- Ability to make building of tests optional, as the demo version
  of lightdm mock has been moved into plugins/LightDM, removing
  the dependency between producition code and test code