← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/server_signal_handling.cpp

  • Committer: Package Import Robot
  • Author(s): CI Train Bot
  • Date: 2015-05-12 13:12:55 UTC
  • mto: This revision was merged to the branch mainline in revision 96.
  • Revision ID: package-import@ubuntu.com-20150512131255-y7z12i8n4pbvo70x
Tags: upstream-0.13.0+15.10.20150512
Import upstream version 0.13.0+15.10.20150512

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance-tests/server_signal_handling.cpp
19
19
#include "mir/server.h"
20
20
 
21
21
#include "mir_test_framework/interprocess_client_server_test.h"
22
 
#include "mir_test_framework/cross_process_sync.h"
 
22
#include "mir_test/cross_process_sync.h"
23
23
 
24
24
#include <gtest/gtest.h>
25
25
#include <gmock/gmock.h>
28
28
 
29
29
#include <chrono>
30
30
 
 
31
namespace mt = mir::test;
31
32
namespace mtf = mir_test_framework;
32
33
 
33
34
namespace
36
37
{
37
38
    std::chrono::seconds const timeout{60};
38
39
    MOCK_CONST_METHOD1(terminate_handler, void(int));
39
 
    mtf::CrossProcessSync cleanup_done;
 
40
    mt::CrossProcessSync cleanup_done;
40
41
 
41
42
    void SetUp() override
42
43
    {
94
95
    const int multiple = 5;
95
96
    expect_server_signalled(SIGABRT);
96
97
 
97
 
    mtf::CrossProcessSync more_cleanup[multiple];
 
98
    mt::CrossProcessSync more_cleanup[multiple];
98
99
 
99
100
    init_server([&]
100
101
       {