← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/integration/helpers/test-helpers-base.cpp

  • Committer: Charles Kerr
  • Date: 2016-08-11 07:12:48 UTC
  • mfrom: (84.1.1 tmp)
  • Revision ID: charles.kerr@canonical.com-20160811071248-xbwoqdtf4itoxnr3
merge lp:~charlesk/keeper/fix-broken-test-coverage-reporting

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration/helpers/test-helpers-base.cpp
20
20
 */
21
21
#include "test-helpers-base.h"
22
22
 
 
23
#include <sys/types.h>
 
24
#include <signal.h>
 
25
 
23
26
void TestHelpersBase::focus_cb(const gchar* appid, gpointer user_data)
24
27
{
25
28
    g_debug("Focus Callback: %s", appid);
92
95
 
93
96
    service = dbus_test_service_new(NULL);
94
97
 
95
 
    auto keeper_process = dbus_test_process_new(KEEPER_SERVICE_BIN);
 
98
    keeper_process = dbus_test_process_new(KEEPER_SERVICE_BIN);
96
99
    dbus_test_task_set_name(DBUS_TEST_TASK(keeper_process), "Keeper");
97
100
    dbus_test_service_add_task(service, DBUS_TEST_TASK(keeper_process));
98
 
    g_clear_object(&keeper_process);
 
101
    g_object_unref(keeper_process);
99
102
 
100
103
    debugConnection();
101
104
 
218
221
 
219
222
void TestHelpersBase::TearDown()
220
223
{
 
224
    kill(dbus_test_process_get_pid(keeper_process), SIGTERM);
 
225
 
221
226
    registry.reset();
222
227
 
223
228
    ubuntu_app_launch_observer_delete_app_focus(focus_cb, this);