diff -Nru indicator-display-0.1+16.04.20160504/data/CMakeLists.txt indicator-display-0.1+16.10.20160722/data/CMakeLists.txt --- indicator-display-0.1+16.04.20160504/data/CMakeLists.txt 2016-05-04 00:04:49.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/data/CMakeLists.txt 2016-07-22 19:15:12.000000000 +0000 @@ -60,6 +60,38 @@ RENAME "${XDG_AUTOSTART_NAME}") ## +## Systemd Unit File +## + +# where to install +# Uncomment when we drop Vivid +# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir) +set (SYSTEMD_USER_DIR "/usr/lib/systemd/user") +message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir") + +set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service") +set (SYSTEMD_USER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SYSTEMD_USER_NAME}") +set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in") + +# build it +set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") +configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}") + +# install it +install (FILES "${SYSTEMD_USER_FILE}" + DESTINATION "${SYSTEMD_USER_DIR}") + +## +## Upstart systemd override Job File +## + +set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart") +message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir") + +install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override" + DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}") + +## ## Unity Indicator File ## diff -Nru indicator-display-0.1+16.04.20160504/data/indicator-display.override indicator-display-0.1+16.10.20160722/data/indicator-display.override --- indicator-display-0.1+16.04.20160504/data/indicator-display.override 1970-01-01 00:00:00.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/data/indicator-display.override 2016-07-22 19:15:12.000000000 +0000 @@ -0,0 +1 @@ +manual diff -Nru indicator-display-0.1+16.04.20160504/data/indicator-display.service.in indicator-display-0.1+16.10.20160722/data/indicator-display.service.in --- indicator-display-0.1+16.04.20160504/data/indicator-display.service.in 1970-01-01 00:00:00.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/data/indicator-display.service.in 2016-07-22 19:15:12.000000000 +0000 @@ -0,0 +1,8 @@ +[Unit] +Description=Indicator Display Backend +PartOf=graphical-session.target +After=indicators-pre.target + +[Service] +ExecStart=@pkglibexecdir@/indicator-display-service +Restart=on-failure diff -Nru indicator-display-0.1+16.04.20160504/debian/changelog indicator-display-0.1+16.10.20160722/debian/changelog --- indicator-display-0.1+16.04.20160504/debian/changelog 2016-07-22 19:21:21.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/debian/changelog 2016-07-22 19:21:21.000000000 +0000 @@ -1,9 +1,8 @@ -indicator-display (0.1+16.04.20160504-0ubuntu1) xenial; urgency=medium +indicator-display (0.1+16.10.20160722-0ubuntu1) yakkety; urgency=medium - * Fix timing issue when talking to com.canonical.UnityGreeter on the - bus. + * Adding a systemd user session unit - -- Charles Kerr Wed, 04 May 2016 00:04:56 +0000 + -- Ted Gould Fri, 22 Jul 2016 19:15:56 +0000 indicator-display (0.1+16.04.20160324.1-0ubuntu1) xenial; urgency=medium diff -Nru indicator-display-0.1+16.04.20160504/debian/control indicator-display-0.1+16.10.20160722/debian/control --- indicator-display-0.1+16.04.20160504/debian/control 2016-07-22 19:21:21.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/debian/control 2016-07-22 19:21:21.000000000 +0000 @@ -23,6 +23,8 @@ # for packaging debhelper (>= 9), dh-translations, +# for systemd unit + systemd, Standards-Version: 3.9.5 Homepage: http://launchpad.net/indicator-display/ X-Ubuntu-Use-Langpack: yes @@ -36,5 +38,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140813), + indicator-common, Description: Collection of small indicators Indicators too small to merit separate codebases, such as Rotation Lock diff -Nru indicator-display-0.1+16.04.20160504/src/greeter.cpp indicator-display-0.1+16.10.20160722/src/greeter.cpp --- indicator-display-0.1+16.04.20160504/src/greeter.cpp 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/src/greeter.cpp 2016-07-22 19:14:51.000000000 +0000 @@ -26,166 +26,117 @@ { public: - Impl() + Impl(): + m_cancellable{g_cancellable_new()} { - m_cancellable.reset( - g_cancellable_new(), - [](GCancellable* o){ - g_cancellable_cancel(o); - g_clear_object(&o); - } - ); - - g_bus_get(G_BUS_TYPE_SESSION, m_cancellable.get(), on_bus_ready, this); + g_bus_get(G_BUS_TYPE_SESSION, m_cancellable, on_bus_ready_static, this); } - ~Impl() =default; - - core::Property& state() + ~Impl() { - return m_state; - } + g_cancellable_cancel(m_cancellable); + g_clear_object(&m_cancellable); -private: + if (m_subscription_id != 0) + g_dbus_connection_signal_unsubscribe (m_bus, m_subscription_id); + + g_clear_object(&m_bus); + } - void set_state(const State& state) + core::Property& is_active() { - m_state.set(state); + return m_is_active; } - static void on_bus_ready( - GObject* /*source*/, - GAsyncResult* res, - gpointer gself) +private: + + static void on_bus_ready_static(GObject* /*source*/, GAsyncResult* res, gpointer gself) { GError* error {}; - auto bus = g_bus_get_finish(res, &error); - if (error != nullptr) - { + auto bus = g_bus_get_finish (res, &error); + if (error != nullptr) { if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) - g_warning("Greeter: Error getting bus: %s", error->message); + g_warning("UsbSnap: Error getting session bus: %s", error->message); g_clear_error(&error); + } else { + static_cast(gself)->on_bus_ready(bus); } - else - { - auto self = static_cast(gself); + g_clear_object(&bus); + } - const auto watcher_id = g_bus_watch_name_on_connection( - bus, - DBusNames::UnityGreeter::NAME, - G_BUS_NAME_WATCHER_FLAGS_AUTO_START, - on_greeter_appeared, - on_greeter_vanished, - gself, - nullptr); - - const auto subscription_id = g_dbus_connection_signal_subscribe( - bus, - DBusNames::UnityGreeter::NAME, - DBusNames::Properties::INTERFACE, - DBusNames::Properties::PropertiesChanged::NAME, - DBusNames::UnityGreeter::PATH, - DBusNames::UnityGreeter::INTERFACE, - G_DBUS_SIGNAL_FLAGS_NONE, - on_properties_changed_signal, - gself, - nullptr); - - self->m_bus.reset( - bus, - [watcher_id, subscription_id](GDBusConnection* o){ - g_bus_unwatch_name(watcher_id); - g_dbus_connection_signal_unsubscribe(o, subscription_id); - g_clear_object(&o); - } - ); - } + void on_bus_ready(GDBusConnection* bus) + { + m_bus = G_DBUS_CONNECTION(g_object_ref(G_OBJECT(bus))); + + g_dbus_connection_call(m_bus, + DBusNames::UnityGreeter::NAME, + DBusNames::UnityGreeter::PATH, + DBusNames::Properties::INTERFACE, + "Get", + g_variant_new("(ss)", DBusNames::UnityGreeter::INTERFACE, "IsActive"), + G_VARIANT_TYPE("(v)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + m_cancellable, + on_get_is_active_ready, + this); + + m_subscription_id = g_dbus_connection_signal_subscribe(m_bus, + DBusNames::UnityGreeter::NAME, + DBusNames::Properties::INTERFACE, + DBusNames::Properties::PropertiesChanged::NAME, + DBusNames::UnityGreeter::PATH, + DBusNames::UnityGreeter::INTERFACE, + G_DBUS_SIGNAL_FLAGS_NONE, + on_properties_changed_signal, + this, + nullptr); } - static void on_greeter_appeared( - GDBusConnection* bus, - const char* /*name*/, - const char* name_owner, - gpointer gself) - { - auto self = static_cast(gself); - - self->m_owner = name_owner; - - g_dbus_connection_call( - bus, - DBusNames::UnityGreeter::NAME, - DBusNames::UnityGreeter::PATH, - DBusNames::Properties::INTERFACE, - "Get", - g_variant_new("(ss)", DBusNames::UnityGreeter::INTERFACE, "IsActive"), - G_VARIANT_TYPE("(v)"), - G_DBUS_CALL_FLAGS_NONE, - -1, - self->m_cancellable.get(), - on_get_is_active_ready, - gself); - } - - static void on_greeter_vanished( - GDBusConnection* /*bus*/, - const char* /*name*/, - gpointer gself) - { - auto self = static_cast(gself); - - self->m_owner.clear(); - self->set_state(State::UNAVAILABLE); - } - - static void on_get_is_active_ready( - GObject* source, - GAsyncResult* res, - gpointer gself) + static void on_get_is_active_ready(GObject* source, GAsyncResult* res, gpointer gself) { GError* error {}; auto v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), res, &error); if (error != nullptr) { if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) - g_warning("Greeter: Error getting IsActive property: %s", error->message); + g_warning("UsbSnap: Error getting session bus: %s", error->message); g_clear_error(&error); } else { GVariant* is_active {}; g_variant_get_child(v, 0, "v", &is_active); - static_cast(gself)->set_state(g_variant_get_boolean(is_active) ? State::ACTIVE : State::INACTIVE); + static_cast(gself)->m_is_active.set(g_variant_get_boolean(is_active)); g_clear_pointer(&is_active, g_variant_unref); } g_clear_pointer(&v, g_variant_unref); } - static void on_properties_changed_signal( - GDBusConnection* /*bus*/, - const gchar* sender_name, - const gchar* object_path, - const gchar* interface_name, - const gchar* signal_name, - GVariant* parameters, - gpointer gself) + static void on_properties_changed_signal(GDBusConnection* /*connection*/, + const gchar* /*sender_name*/, + const gchar* object_path, + const gchar* interface_name, + const gchar* signal_name, + GVariant* parameters, + gpointer gself) { - auto self = static_cast(gself); - - g_return_if_fail(!g_strcmp0(sender_name, self->m_owner.c_str())); g_return_if_fail(!g_strcmp0(object_path, DBusNames::UnityGreeter::PATH)); g_return_if_fail(!g_strcmp0(interface_name, DBusNames::Properties::INTERFACE)); g_return_if_fail(!g_strcmp0(signal_name, DBusNames::Properties::PropertiesChanged::NAME)); g_return_if_fail(g_variant_is_of_type(parameters, G_VARIANT_TYPE(DBusNames::Properties::PropertiesChanged::ARGS_VARIANT_TYPE))); - auto v = g_variant_get_child_value(parameters, 1); + auto v = g_variant_get_child_value (parameters, 1); gboolean is_active {}; if (g_variant_lookup(v, "IsActive", "b", &is_active)) - self->set_state(is_active ? State::ACTIVE : State::INACTIVE); + { + g_debug("%s is_active changed to %d", G_STRLOC, int(is_active)); + static_cast(gself)->m_is_active.set(is_active); + } g_clear_pointer(&v, g_variant_unref); } - core::Property m_state {State::UNAVAILABLE}; - std::shared_ptr m_cancellable; - std::shared_ptr m_bus; - std::string m_owner; + core::Property m_is_active; + GCancellable* m_cancellable {}; + GDBusConnection* m_bus {}; + unsigned int m_subscription_id {}; }; /*** @@ -203,8 +154,8 @@ UnityGreeter::~UnityGreeter() =default; -core::Property& -UnityGreeter::state() +core::Property& +UnityGreeter::is_active() { - return impl->state(); + return impl->is_active(); } diff -Nru indicator-display-0.1+16.04.20160504/src/greeter.h indicator-display-0.1+16.10.20160722/src/greeter.h --- indicator-display-0.1+16.04.20160504/src/greeter.h 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/src/greeter.h 2016-07-22 19:14:51.000000000 +0000 @@ -29,13 +29,7 @@ public: Greeter(); virtual ~Greeter(); - - enum class State { UNAVAILABLE, INACTIVE, ACTIVE }; -static inline const char* state_str(const State& state) { - static constexpr char const * state_str[] = { "Unavailable", "Inactive", "Active" }; - return state_str[int(state)]; -} - virtual core::Property& state() =0; + virtual core::Property& is_active() =0; }; @@ -44,7 +38,7 @@ public: UnityGreeter(); virtual ~UnityGreeter(); - core::Property& state() override; + core::Property& is_active() override; protected: class Impl; diff -Nru indicator-display-0.1+16.04.20160504/src/usb-manager.cpp indicator-display-0.1+16.10.20160722/src/usb-manager.cpp --- indicator-display-0.1+16.04.20160504/src/usb-manager.cpp 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/src/usb-manager.cpp 2016-07-22 19:14:51.000000000 +0000 @@ -46,84 +46,72 @@ m_greeter{greeter} { m_usb_monitor->on_usb_disconnected().connect([this](const std::string& /*usb_name*/) { - m_req.reset(); + restart(); }); - m_greeter->state().changed().connect([this](const Greeter::State& state) { - if (state == Greeter::State::INACTIVE) - maybe_snap(); - else - stop_snap(); + m_greeter->is_active().changed().connect([this](bool /*is_active*/) { + maybe_snap(); }); - // create a new adbd client - m_adbd_client.reset(new GAdbdClient{m_socket_path}); - m_adbd_client->on_pk_request().connect( - [this](const AdbdClient::PKRequest& req) { - g_debug("%s got pk request: %s, calling maybe_snap()", G_STRLOC, req.fingerprint.c_str()); - - m_response = AdbdClient::PKResponse::DENY; // set the fallback response - m_req.reset( - new AdbdClient::PKRequest(req), - [this](AdbdClient::PKRequest* r) { - stop_snap(); - r->respond(m_response); - delete r; - } - ); - maybe_snap(); - } - ); + restart(); } ~Impl() { - if (m_request_complete_idle_tag) - g_source_remove(m_request_complete_idle_tag); + if (m_restart_idle_tag) + g_source_remove(m_restart_idle_tag); + + clear(); } private: - void stop_snap() + void clear() { + // clear out old state m_snap_connections.clear(); m_snap.reset(); + m_req = decltype(m_req)(); + m_adbd_client.reset(); } - void maybe_snap() + void restart() { - // only prompt if there's something to prompt about - if (!m_req) - return; + clear(); - // only prompt in an unlocked session - if (m_greeter->state().get() != Greeter::State::INACTIVE) - return; + // set a new client + m_adbd_client.reset(new GAdbdClient{m_socket_path}); + m_adbd_client->on_pk_request().connect( + [this](const AdbdClient::PKRequest& req) { + g_debug("%s got pk request: %s", G_STRLOC, req.fingerprint.c_str()); + m_req = req; + maybe_snap(); + } + ); + } - snap(); + void maybe_snap() + { + // don't prompt in the greeter! + if (!m_req.public_key.empty() && !m_greeter->is_active().get()) + snap(); } void snap() { - m_snap = std::make_shared(m_req->fingerprint); + m_snap = std::make_shared(m_req.fingerprint); m_snap_connections.insert((*m_snap).on_user_response().connect( [this](AdbdClient::PKResponse response, bool remember_choice){ - + g_debug("%s user responded! response %d, remember %d", G_STRLOC, int(response), int(remember_choice)); + m_req.respond(response); if (remember_choice && (response == AdbdClient::PKResponse::ALLOW)) - write_public_key(m_req->public_key); - - m_response = response; - - // defer finishing the request into an idle func because - // ScopedConnections can't be destroyed inside their callbacks - if (m_request_complete_idle_tag == 0) { - m_request_complete_idle_tag = g_idle_add([](gpointer gself){ - auto self = static_cast(gself); - self->m_request_complete_idle_tag = 0; - self->m_req.reset(); - return G_SOURCE_REMOVE; - }, this); - } + write_public_key(m_req.public_key); + m_restart_idle_tag = g_idle_add([](gpointer gself){ + auto self = static_cast(gself); + self->m_restart_idle_tag = 0; + self->restart(); + return G_SOURCE_REMOVE; + }, this); } )); } @@ -164,13 +152,12 @@ const std::shared_ptr m_usb_monitor; const std::shared_ptr m_greeter; - unsigned int m_request_complete_idle_tag {}; + unsigned int m_restart_idle_tag {}; std::shared_ptr m_adbd_client; + AdbdClient::PKRequest m_req; std::shared_ptr m_snap; std::set m_snap_connections; - AdbdClient::PKResponse m_response {AdbdClient::PKResponse::DENY}; - std::shared_ptr m_req; }; /*** diff -Nru indicator-display-0.1+16.04.20160504/src/usb-snap.cpp indicator-display-0.1+16.10.20160722/src/usb-snap.cpp --- indicator-display-0.1+16.04.20160504/src/usb-snap.cpp 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/src/usb-snap.cpp 2016-07-22 19:14:51.000000000 +0000 @@ -208,7 +208,6 @@ const bool remember_this_choice = response == AdbdClient::PKResponse::ALLOW; m_on_user_response(response, remember_this_choice); - m_notification_id = 0; } void on_notification_closed(uint32_t close_reason) diff -Nru indicator-display-0.1+16.04.20160504/tests/integration/usb-manager-test.cpp indicator-display-0.1+16.10.20160722/tests/integration/usb-manager-test.cpp --- indicator-display-0.1+16.04.20160504/tests/integration/usb-manager-test.cpp 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/tests/integration/usb-manager-test.cpp 2016-07-22 19:14:51.000000000 +0000 @@ -143,7 +143,7 @@ ); // confirm that the AdbdServer got the right response - wait_for([adbd_server](){return !adbd_server->m_responses.empty();}, 5000); + wait_for([adbd_server](){return !adbd_server->m_responses.empty();}, 2000); ASSERT_EQ(1, adbd_server->m_responses.size()); EXPECT_EQ("OK", adbd_server->m_responses.front()); @@ -163,16 +163,13 @@ const std::shared_ptr public_keys_path {new std::string{*m_tmpdir+"/adb_keys"}, file_deleter}; // start a mock AdbdServer ready to submit a request - const size_t N_TESTS {3}; const std::string public_key {"public_key"}; - const std::vector requests(N_TESTS, "PK"+public_key); - const std::vector expected_responses(N_TESTS, "NO"); - auto adbd_server = std::make_shared(*socket_path, requests); + auto adbd_server = std::make_shared(*socket_path, std::vector{"PK"+public_key}); // set up a UsbManager to process the request auto usb_manager = std::make_shared(*socket_path, *public_keys_path, m_usb_monitor, m_greeter); - for (std::remove_const::type i=0; im_responses.size() == N_TESTS;}, 5000)); - EXPECT_EQ(expected_responses, adbd_server->m_responses); } TEST_F(UsbManagerFixture, Greeter) @@ -212,7 +206,7 @@ auto adbd_server = std::make_shared(*socket_path, std::vector{"PK"+public_key}); // set up a UsbManager to process the request - m_greeter->m_state.set(Greeter::State::ACTIVE); + m_greeter->m_is_active.set(true); auto usb_manager = std::make_shared(*socket_path, *public_keys_path, m_usb_monitor, m_greeter); // add a signal spy to listen to the notification daemon @@ -225,7 +219,7 @@ EXPECT_FALSE(notificationsSpy.wait(2000)); // disable the greeter, the notification should appear - m_greeter->m_state.set(Greeter::State::INACTIVE); + m_greeter->m_is_active.set(false); wait_for_signals(notificationsSpy, 1); EXPECT_EQ("Notify", notificationsSpy.at(0).at(0)); notificationsSpy.clear(); diff -Nru indicator-display-0.1+16.04.20160504/tests/unit/CMakeLists.txt indicator-display-0.1+16.10.20160722/tests/unit/CMakeLists.txt --- indicator-display-0.1+16.04.20160504/tests/unit/CMakeLists.txt 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/tests/unit/CMakeLists.txt 2016-07-22 19:14:51.000000000 +0000 @@ -14,10 +14,6 @@ ${GMOCK_LIBRARIES} ) -add_definitions( - -DGREETER_TEMPLATE="${CMAKE_SOURCE_DIR}/tests/utils/mock-unity-greeter.py" -) - function(add_test_by_name name) set(TEST_NAME ${name}) add_executable (${TEST_NAME} ${TEST_NAME}.cpp) @@ -35,5 +31,4 @@ set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT}) target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES} ${THREAD_LINK_LIBRARIES}) endfunction() -add_qt_test_by_name(greeter-test) add_qt_test_by_name(usb-snap-test) diff -Nru indicator-display-0.1+16.04.20160504/tests/unit/greeter-test.cpp indicator-display-0.1+16.10.20160722/tests/unit/greeter-test.cpp --- indicator-display-0.1+16.04.20160504/tests/unit/greeter-test.cpp 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/tests/unit/greeter-test.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,159 +0,0 @@ -/* - * Copyright 2016 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - * - * Authors: - * Charles Kerr - */ - -#include -#include - -#include -#include - -#include -#include -#include - -class GreeterFixture: public QtFixture -{ -private: - - using super = QtFixture; - -public: - - GreeterFixture() =default; - ~GreeterFixture() =default; - -protected: - - std::shared_ptr m_dbus_runner; - std::shared_ptr m_dbus_mock; - GDBusConnection* m_bus {}; - - void SetUp() override - { - super::SetUp(); - - // use a fresh bus for each test run - m_dbus_runner.reset(new QtDBusTest::DBusTestRunner()); - m_dbus_mock.reset(new QtDBusMock::DBusMock(*m_dbus_runner.get())); - - GError* error {}; - m_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, nullptr, &error); - g_assert_no_error(error); - g_dbus_connection_set_exit_on_close(m_bus, FALSE); - } - - void TearDown() override - { - g_clear_object(&m_bus); - - super::TearDown(); - } - - void start_greeter_service(bool is_active) - { - // set a watcher to look for our mock greeter to appear - bool owned {}; - QDBusServiceWatcher watcher( - DBusNames::UnityGreeter::NAME, - m_dbus_runner->sessionConnection() - ); - QObject::connect( - &watcher, - &QDBusServiceWatcher::serviceRegistered, - [&owned](const QString&){owned = true;} - ); - - // start the mock greeter - QVariantMap parameters; - parameters["IsActive"] = QVariant(is_active); - m_dbus_mock->registerTemplate( - DBusNames::UnityGreeter::NAME, - GREETER_TEMPLATE, - parameters, - QDBusConnection::SessionBus - ); - m_dbus_runner->startServices(); - - // wait for the watcher - ASSERT_TRUE(wait_for([&owned]{return owned;})); - } -}; - -#define ASSERT_PROPERTY_EQ_EVENTUALLY(expected_in, property_in) \ - do { \ - const auto& e = expected_in; \ - const auto& p = property_in; \ - ASSERT_TRUE(wait_for([e, &p](){return e == p.get();})) \ - << "expected " << e << " but got " << p.get(); \ - } while(0) - -/** - * Test startup timing by looking at four different cases: - * [unity greeter shows up on bus (before, after) we start listening] - * x [unity greeter is (active, inactive)] - */ - -TEST_F(GreeterFixture, ActiveServiceStartsBeforeWatcher) -{ - constexpr bool is_active {true}; - constexpr Greeter::State expected {Greeter::State::ACTIVE}; - - start_greeter_service(is_active); - - UnityGreeter greeter; - - ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state()); -} - -TEST_F(GreeterFixture, WatcherStartsBeforeActiveService) -{ - constexpr bool is_active {true}; - constexpr Greeter::State expected {Greeter::State::ACTIVE}; - - UnityGreeter greeter; - - start_greeter_service(is_active); - - ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state()); -} - -TEST_F(GreeterFixture, InactiveServiceStartsBeforeWatcher) -{ - constexpr bool is_active {false}; - constexpr Greeter::State expected {Greeter::State::INACTIVE}; - - start_greeter_service(is_active); - - UnityGreeter greeter; - - ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state()); -} - -TEST_F(GreeterFixture, WatcherStartsBeforeInactiveService) -{ - constexpr bool is_active {false}; - constexpr Greeter::State expected {Greeter::State::INACTIVE}; - - UnityGreeter greeter; - - start_greeter_service(is_active); - - ASSERT_PROPERTY_EQ_EVENTUALLY(expected, greeter.state()); -} - diff -Nru indicator-display-0.1+16.04.20160504/tests/unit/usb-snap-test.cpp indicator-display-0.1+16.10.20160722/tests/unit/usb-snap-test.cpp --- indicator-display-0.1+16.04.20160504/tests/unit/usb-snap-test.cpp 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/tests/unit/usb-snap-test.cpp 2016-07-22 19:14:51.000000000 +0000 @@ -130,9 +130,14 @@ EXPECT_TRUE(user_response_set); ASSERT_EQ(test.expected_response, user_response); - // confirm that the snap dtor doesn't try to close - // the notification that's already been closed by user choice + // confirm that the snap dtor cleans up the notification snap.reset(); - EXPECT_FALSE(notificationsSpy.wait(1000)); + wait_for_signals(notificationsSpy, 1); + { + QVariantList const& call(notificationsSpy.at(0)); + EXPECT_EQ("CloseNotification", call.at(0)); + QVariantList const& args(call.at(1).toList()); + EXPECT_EQ(id, args.at(0)); + } } } diff -Nru indicator-display-0.1+16.04.20160504/tests/utils/adbd-server.h indicator-display-0.1+16.10.20160722/tests/utils/adbd-server.h --- indicator-display-0.1+16.04.20160504/tests/utils/adbd-server.h 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/tests/utils/adbd-server.h 2016-07-22 19:14:51.000000000 +0000 @@ -38,7 +38,7 @@ GAdbdServer(const std::string& socket_path, const std::vector& requests): m_requests{requests}, - m_server_socket{create_server_socket(socket_path)}, + m_socket_path{socket_path}, m_cancellable{g_cancellable_new()}, m_worker_thread{&GAdbdServer::worker_func, this} { @@ -50,7 +50,6 @@ g_cancellable_cancel(m_cancellable); m_worker_thread.join(); g_clear_object(&m_cancellable); - g_clear_object(&m_server_socket); } const std::vector m_requests; @@ -60,14 +59,18 @@ void worker_func() // runs in worker thread { + auto server_socket = create_server_socket(m_socket_path); auto requests = m_requests; + GError* error {}; + g_socket_listen (server_socket, &error); + g_assert_no_error (error); + while (!g_cancellable_is_cancelled(m_cancellable) && !requests.empty()) { // wait for a client connection g_message("GAdbdServer::Impl::worker_func() calling g_socket_accept()"); - GError* error {}; - auto client_socket = g_socket_accept(m_server_socket, m_cancellable, &error); + auto client_socket = g_socket_accept(server_socket, m_cancellable, &error); if (error != nullptr) { if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) g_message("GAdbdServer: Error accepting socket connection: %s", error->message); @@ -118,6 +121,8 @@ // cleanup g_clear_object(&client_socket); } + + g_clear_object(&server_socket); } // bind to a local domain socket @@ -134,14 +139,11 @@ g_assert_no_error (error); g_clear_object (&address); - g_socket_listen (socket, &error); - g_assert_no_error (error); - return socket; } - GSocket* m_server_socket {}; - GCancellable* m_cancellable {}; + const std::string m_socket_path; + GCancellable* m_cancellable = nullptr; std::thread m_worker_thread; }; diff -Nru indicator-display-0.1+16.04.20160504/tests/utils/gtest-print-helpers.h indicator-display-0.1+16.10.20160722/tests/utils/gtest-print-helpers.h --- indicator-display-0.1+16.04.20160504/tests/utils/gtest-print-helpers.h 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/tests/utils/gtest-print-helpers.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ - -#pragma once - -#include - -inline void PrintTo(const Greeter::State& state, std::ostream* os) { - switch(state) { - case Greeter::State::ACTIVE: *os << "Active"; break; - case Greeter::State::INACTIVE: *os << "Inactive"; break; - case Greeter::State::UNAVAILABLE: *os << "Unavailable"; break; - } -} - -inline std::ostream& operator<<(std::ostream& os, const Greeter::State& state) { - PrintTo(state, &os); - return os; -} - diff -Nru indicator-display-0.1+16.04.20160504/tests/utils/mock-greeter.h indicator-display-0.1+16.10.20160722/tests/utils/mock-greeter.h --- indicator-display-0.1+16.04.20160504/tests/utils/mock-greeter.h 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/tests/utils/mock-greeter.h 2016-07-22 19:14:51.000000000 +0000 @@ -26,7 +26,7 @@ public: MockGreeter() =default; virtual ~MockGreeter() =default; - core::Property& state() override {return m_state;} - core::Property m_state {State::INACTIVE}; + core::Property& is_active() override {return m_is_active;} + core::Property m_is_active {false}; }; diff -Nru indicator-display-0.1+16.04.20160504/tests/utils/mock-unity-greeter.py indicator-display-0.1+16.10.20160722/tests/utils/mock-unity-greeter.py --- indicator-display-0.1+16.04.20160504/tests/utils/mock-unity-greeter.py 2016-05-04 00:04:54.000000000 +0000 +++ indicator-display-0.1+16.10.20160722/tests/utils/mock-unity-greeter.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -'''unity greeter mock template - -Very basic template that just mocks the greeter is-active flag -''' - -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU Lesser General Public License as published by the Free -# Software Foundation; either version 3 of the License, or (at your option) any -# later version. See http://www.gnu.org/copyleft/lgpl.html for the full text -# of the license. - -__author__ = 'Charles Kerr' -__email__ = 'charles.kerr@canonical.com' -__copyright__ = '(c) 2016 Canonical Ltd.' -__license__ = 'LGPL 3+' - -import dbus -import os - -from dbusmock import MOCK_IFACE, mockobject - -BUS_NAME = 'com.canonical.UnityGreeter' -MAIN_OBJ = '/' -MAIN_IFACE = 'com.canonical.UnityGreeter' -SYSTEM_BUS = False - - -def load(mock, parameters): - mock.AddMethods( - MAIN_IFACE, [ - ('HideGreeter', '', '', 'self.Set("com.canonical.UnityGreeter", "IsActive", False)'), - ('ShowGreeter', '', '', 'self.Set("com.canonical.UnityGreeter", "IsActive", True)') - ] - ) - mock.AddProperties( - MAIN_IFACE, - dbus.Dictionary({ - 'IsActive': parameters.get('IsActive', False), - }, signature='sv') - ) -