Merge lp://staging/~thomas-voss/media-hub/enable-integration-testing-take-2 into lp://staging/media-hub
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~thomas-voss/media-hub/enable-integration-testing-take-2 |
| Merge into: | lp://staging/media-hub |
| Prerequisite: | lp://staging/~thomas-voss/media-hub/add-display-controller-interface |
| Diff against target: |
4083 lines (+2351/-922) 39 files modified
debian/libmedia-hub-common3.symbols (+24/-0) include/core/media/player.h (+1/-1) src/core/media/CMakeLists.txt (+12/-4) src/core/media/apparmor/context.cpp (+30/-0) src/core/media/apparmor/context.h (+51/-0) src/core/media/apparmor/dbus.h (+4/-3) src/core/media/apparmor/ubuntu.cpp (+138/-0) src/core/media/apparmor/ubuntu.h (+153/-0) src/core/media/base_engine.cpp (+181/-0) src/core/media/base_engine.h (+100/-0) src/core/media/base_player.cpp (+250/-0) src/core/media/base_player.h (+127/-0) src/core/media/engine.cpp (+20/-0) src/core/media/engine.h (+4/-0) src/core/media/engine_factory.h (+39/-0) src/core/media/gstreamer/engine_factory.cpp (+31/-0) src/core/media/gstreamer/engine_factory.h (+40/-0) src/core/media/gstreamer/playbin.cpp (+1/-1) src/core/media/hashed_keyed_player_store.cpp (+80/-0) src/core/media/hashed_keyed_player_store.h (+76/-0) src/core/media/keyed_player_store.h (+83/-0) src/core/media/mpris/exported.h (+305/-0) src/core/media/mutable_player.h (+60/-0) src/core/media/player.cpp (+1/-7) src/core/media/player_configuration.h (+3/-9) src/core/media/player_implementation.cpp (+8/-19) src/core/media/player_implementation.h (+10/-8) src/core/media/player_skeleton.cpp (+248/-322) src/core/media/player_skeleton.h (+31/-36) src/core/media/player_stub.h (+1/-1) src/core/media/power/state_controller.cpp (+30/-0) src/core/media/power/state_controller.h (+5/-0) src/core/media/server/server.cpp (+35/-7) src/core/media/service_implementation.cpp (+53/-50) src/core/media/service_implementation.h (+18/-9) src/core/media/service_skeleton.cpp (+64/-386) src/core/media/service_skeleton.h (+32/-33) tests/CMakeLists.txt (+1/-1) tests/unit-tests/CMakeLists.txt (+1/-25) |
| To merge this branch: | bzr merge lp://staging/~thomas-voss/media-hub/enable-integration-testing-take-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
Abstract out functional dependencies of components to enable integration testing.
Description of the change
Abstract out functional dependencies of components to enable integration testing.
Unmerged revisions
- 110. By Thomas Voß
-
Factor out query for apparmor context, and define a default implementation querying the dbus daemon for the apparmor profile of a calling entity.
- 109. By Thomas Voß
-
Adjust symbols file.
- 108. By Thomas Voß
-
Remerge prerequisite branch.
- 107. By Thomas Voß
-
[ Jim Hodapp ]
* Pause playback when a headphone is unplugged or an A2DP device is
unpaired (LP: #1368300)
[ Ricardo Mendoza ]
* Pause playback when a headphone is unplugged or an A2DP device is
unpaired (LP: #1368300) - 106. By Thomas Voß
-
Factor out authentication of incoming open_uri(...) requests.
- 105. By Thomas Voß
-
Simplify linking of test cases.
- 104. By Thomas Voß
-
Disable acceptance tests for now.
- 103. By Thomas Voß
-
Abstract out functional dependencies of components to enable integration testing.
- 102. By Thomas Voß
-
Make ClientDeathObserver instance a dependency passed down through ctors.
- 101. By Thomas Voß
-
Adjust setup of service instance in acceptance tests.
