lp://qastaging/~xavi-garcia-mena/keeper/upstart-mock-helpers-tests-changed

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/keeper/devel

Charles Kerr (community): Approve on 2016-08-31

unity-api-1-bot: Needs Fixing (continuous-integration) on 2016-08-31

Diff: 2487 lines (+998/-900)

30 files modified

include/helper/helper.h (+3/-1)
src/helper/backup-helper.cpp (+18/-11)
src/helper/helper.cpp (+35/-9)
src/service/keeper-task-backup.cpp (+4/-0)
src/service/keeper-task.cpp (+4/-0)
src/service/task-manager.cpp (+4/-0)
src/util/attributes.h (+0/-26)
tests/CMakeLists.txt (+26/-0)
tests/fakes/CMakeLists.txt (+3/-0)
tests/fakes/inactive_helper.sh (+22/-0)
tests/fakes/upstart/CMakeLists.txt (+68/-0)
tests/fakes/upstart/com.ubuntu.Upstart0_6.Instance.xml (+7/-0)
tests/fakes/upstart/com.ubuntu.Upstart0_6.Job.xml (+19/-0)
tests/fakes/upstart/com.ubuntu.Upstart0_6.xml (+18/-0)
tests/fakes/upstart/main.cpp (+83/-0)
tests/fakes/upstart/upstart-defs.h (+35/-0)
tests/fakes/upstart/upstart-instance-mock.cpp (+37/-0)
tests/fakes/upstart/upstart-instance-mock.h (+47/-0)
tests/fakes/upstart/upstart-job-mock.cpp (+179/-0)
tests/fakes/upstart/upstart-job-mock.h (+56/-0)
tests/fakes/upstart/upstart-mock.cpp (+50/-0)
tests/fakes/upstart/upstart-mock.h (+46/-0)
tests/integration/helpers/CMakeLists.txt (+2/-3)
tests/integration/helpers/helpers-test-failure.cpp (+7/-13)
tests/integration/helpers/helpers-test.cc (+58/-220)
tests/integration/helpers/mir-mock.cpp (+0/-124)
tests/integration/helpers/mir-mock.h (+0/-31)
tests/integration/helpers/test-helpers-base.cpp (+126/-396)
tests/integration/helpers/test-helpers-base.h (+40/-65)
tests/utils/file-utils.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

101. By Xavi Garcia on 2016-08-31

Removed log statement

100. By Xavi Garcia on 2016-08-31

Fixed conflicts

99. By Xavi Garcia on 2016-08-31

conflicts resolved

98. By Xavi Garcia on 2016-08-31

merged lp:~xavi-garcia-mena/keeper/task-state-manager

97. By Marcus Tomlinson on 2016-08-29

merge lp:~marcustomlinson/keeper/qml-plugin

96. By Marcus Tomlinson on 2016-08-29

merge lp:~marcustomlinson/keeper/link-against-real-storage-framework

95. By Charles Kerr on 2016-08-22

merge lp:~charlesk/keeper/lp-1614764-fix-excess-signal-subscriptions

94. By Charles Kerr on 2016-08-21

merge lp:~charlesk/keeper/fix-armhf-warnings

93. By Xavi Garcia on 2016-08-19

merge lp:~xavi-garcia-mena/keeper/ual-moved-to-helper-class

92. By Charles Kerr on 2016-08-18

Corrected fix for the speed test failures. Fixes: https://bugs.launchpad.net/bugs/1607393.

Approved by unity-api-1-bot, Xavi Garcia.