lp:~charlesk/indicator-display/adbd-client-test-failure

Branch merges

Merged into lp:indicator-display at revision 21

dobey (community): Approve on 2016-10-21

unity-api-1-bot: Approve (continuous-integration) on 2016-10-21

Diff: 1012 lines (+474/-170)

14 files modified

src/adbd-client.cpp (+16/-9)
src/greeter.cpp (+132/-82)
src/greeter.h (+8/-2)
src/usb-manager.cpp (+65/-48)
src/usb-snap.cpp (+1/-0)
tests/integration/usb-manager-test.cpp (+11/-5)
tests/unit/CMakeLists.txt (+5/-0)
tests/unit/adbd-client-test.cpp (+3/-2)
tests/unit/greeter-test.cpp (+159/-0)
tests/unit/usb-snap-test.cpp (+4/-9)
tests/utils/adbd-server.h (+9/-11)
tests/utils/gtest-print-helpers.h (+18/-0)
tests/utils/mock-greeter.h (+2/-2)
tests/utils/mock-unity-greeter.py (+41/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

40. By Charles Kerr on 2016-10-21

add block braces as suggested by dobey

39. By Charles Kerr on 2016-10-19

remove dead code

38. By Charles Kerr on 2016-10-19

remove the temporary tracers from r34 and r35

37. By Charles Kerr on 2016-09-22

use a std::atomic for adbd-client's m_pkresponse_ready

36. By Charles Kerr on 2016-09-22

fix tyop

35. By Charles Kerr on 2016-09-22

sync with lp:~charlesk/indicator-display/lp-1572545-prompt-in-lockscreen

34. By Charles Kerr on 2016-09-22

keep piling 'em on

33. By Charles Kerr on 2016-09-22

tweak the debug tracers

32. By Charles Kerr on 2016-09-22

more g_debug() tracers

31. By Charles Kerr on 2016-09-22

in UsbSnapTest, explicitly disconnect the core::Signals at the end of the test