diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-09-06 19:37:50 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2016-09-06 19:37:50 +0200 |
| commit | 35ab8dbc68d5f4d6a0cdf145486d740bbd901357 (patch) | |
| tree | 7f4fe287b56ec29dec2c9bf2720049b805611390 /tests | |
| parent | 701a4206b2932b00ee79e8d61f3157139ef32c4b (diff) | |
| parent | b22ddf542ece6ee86d9b29b69cb53b234d74db11 (diff) | |
Merging with lp:~3v1n0/unity/systemd-unit-fixes
(bzr r3788.10.6)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_launcher_controller.cpp | 2 | ||||
| -rw-r--r-- | tests/test_systemd_wrapper.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_launcher_controller.cpp b/tests/test_launcher_controller.cpp index 7faea517c..6a335bf8c 100644 --- a/tests/test_launcher_controller.cpp +++ b/tests/test_launcher_controller.cpp @@ -25,6 +25,7 @@ #include "ExpoLauncherIcon.h" #include "DesktopLauncherIcon.h" #include "DesktopUtilities.h" +#include "InputMonitor.h" #include "MockableBaseWindow.h" #include "MockLauncherIcon.h" #include "BFBLauncherIcon.h" @@ -286,6 +287,7 @@ protected: std::shared_ptr<helper::CaptureLogOutput> logger_output_; MockUScreen uscreen; panel::Style panel_style; + input::Monitor im_; MockFavoriteStore favorite_store; MockXdndManager::Ptr xdnd_manager_; ui::EdgeBarrierController::Ptr edge_barriers_; diff --git a/tests/test_systemd_wrapper.cpp b/tests/test_systemd_wrapper.cpp index f5feff1bd..30d5f9f76 100644 --- a/tests/test_systemd_wrapper.cpp +++ b/tests/test_systemd_wrapper.cpp @@ -60,7 +60,6 @@ struct TestSystemdWrapper : public Test systemd_server_->AddObjects(SYSTEMD, "/org/freedesktop/systemd1"); Utils::WaitUntilMSec([this] { return systemd_server_->IsConnected(); }); - Utils::WaitUntilMSec([this] { return systemd_wrapper_.IsConnected(); }); } unity::glib::DBusServer::Ptr systemd_server_; |