Merge ~afrantzis/repowerd:settings into repowerd:master

Proposed by Alexandros Frantzis
Status: Merged
Merged at revision: ac81a3a8f3c7a91bacaddb53797913770a1a8898
Proposed branch: ~afrantzis/repowerd:settings
Merge into: repowerd:master
Diff against target: 3142 lines (+1892/-78)
45 files modified
src/adapters/default_state_machine_options.cpp (+21/-12)
src/adapters/default_state_machine_options.h (+1/-0)
src/adapters/libsuspend_system_power_control.cpp (+15/-0)
src/adapters/libsuspend_system_power_control.h (+5/-0)
src/adapters/logind_system_power_control.cpp (+63/-0)
src/adapters/logind_system_power_control.h (+20/-3)
src/adapters/upower_power_source_and_lid.h (+2/-1)
src/core/client_settings.h (+59/-0)
src/core/daemon.cpp (+65/-1)
src/core/daemon.h (+2/-0)
src/core/daemon_config.h (+2/-0)
src/core/default_state_machine.cpp (+185/-29)
src/core/default_state_machine.h (+34/-3)
src/core/null_state_machine.h (+8/-1)
src/core/power_action.h (+26/-0)
src/core/power_source.h (+2/-0)
src/core/power_supply.h (+26/-0)
src/core/state_machine.h (+13/-1)
src/core/state_machine_options.h (+1/-0)
src/core/system_power_control.h (+11/-0)
src/default_daemon_config.cpp (+37/-0)
src/default_daemon_config.h (+2/-0)
tests/adapter-tests/fake_logind.cpp (+14/-0)
tests/adapter-tests/fake_logind.h (+2/-0)
tests/adapter-tests/test_default_state_machine_options.cpp (+6/-0)
tests/adapter-tests/test_logind_system_power_control.cpp (+34/-0)
tests/common/fake_system_power_control.cpp (+39/-1)
tests/common/fake_system_power_control.h (+12/-0)
tests/core-tests/CMakeLists.txt (+2/-0)
tests/core-tests/acceptance_test.cpp (+70/-0)
tests/core-tests/acceptance_test.h (+21/-0)
tests/core-tests/daemon_config.cpp (+14/-0)
tests/core-tests/daemon_config.h (+4/-0)
tests/core-tests/fake_client_settings.cpp (+104/-0)
tests/core-tests/fake_client_settings.h (+80/-0)
tests/core-tests/fake_power_source.cpp (+10/-0)
tests/core-tests/fake_power_source.h (+4/-0)
tests/core-tests/fake_state_machine_options.cpp (+7/-0)
tests/core-tests/fake_state_machine_options.h (+1/-0)
tests/core-tests/test_client_requests.cpp (+2/-1)
tests/core-tests/test_client_settings.cpp (+649/-0)
tests/core-tests/test_daemon.cpp (+182/-4)
tests/core-tests/test_lid.cpp (+4/-21)
tests/core-tests/test_session.cpp (+11/-0)
tests/core-tests/test_system_power_control.cpp (+20/-0)
Reviewer Review Type Date Requested Status
Repowerd CI Bot continuous-integration Approve
Review via email: mp+316949@code.qastaging.launchpad.net

Commit message

Internal settings support

Description of the change

Internal settings support

To post a comment you must log in.
Revision history for this message
Repowerd CI Bot (repowerd-ci-bot) wrote :

PASSED: Continuous integration, rev:ac81a3a8f3c7a91bacaddb53797913770a1a8898
https://jenkins.canonical.com/repowerd/job/lp-repowerd-ci/67/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/repowerd/job/build/75
    SUCCESS: https://jenkins.canonical.com/repowerd/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/31
    SUCCESS: https://jenkins.canonical.com/repowerd/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/31
    SUCCESS: https://jenkins.canonical.com/repowerd/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/31
    SUCCESS: https://jenkins.canonical.com/repowerd/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/31
    SUCCESS: https://jenkins.canonical.com/repowerd/job/build-0-fetch-git/85
    SUCCESS: https://jenkins.canonical.com/repowerd/job/build-1-sourcepkg/release=xenial+overlay/58
    SUCCESS: https://jenkins.canonical.com/repowerd/job/build-1-sourcepkg/release=zesty/58
    SUCCESS: https://jenkins.canonical.com/repowerd/job/build-2-binpkg/arch=amd64,release=xenial+overlay/60
        deb: https://jenkins.canonical.com/repowerd/job/build-2-binpkg/arch=amd64,release=xenial+overlay/60/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/repowerd/job/build-2-binpkg/arch=amd64,release=zesty/60
        deb: https://jenkins.canonical.com/repowerd/job/build-2-binpkg/arch=amd64,release=zesty/60/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/repowerd/job/build-2-binpkg/arch=i386,release=xenial+overlay/60
        deb: https://jenkins.canonical.com/repowerd/job/build-2-binpkg/arch=i386,release=xenial+overlay/60/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/repowerd/job/build-2-binpkg/arch=i386,release=zesty/60
        deb: https://jenkins.canonical.com/repowerd/job/build-2-binpkg/arch=i386,release=zesty/60/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/repowerd/job/lp-repowerd-ci/67/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches