1
=== modified file 'include/test/mir_test_framework/async_server_runner.h'
2
--- include/test/mir_test_framework/async_server_runner.h	2015-07-27 07:24:50 +0000
3
+++ include/test/mir_test_framework/async_server_runner.h	2015-11-19 16:26:10 +0000
4
@@ -52,7 +52,7 @@
5
52
    auto new_connection() -> std::string;
52
    auto new_connection() -> std::string;
6
53
53
7
54
    /// \return a connection string for a client to connect to the server
54
    /// \return a connection string for a client to connect to the server
9
55
    auto connection(mir::Fd fd) -> std::string;
55
    auto connection(int fd) -> std::string;
10
56
56
11
57
    mir::Server server;
57
    mir::Server server;
12
58
58
13
@@ -60,8 +60,6 @@
14
60
    std::list<TemporaryEnvironmentValue> env;
60
    std::list<TemporaryEnvironmentValue> env;
15
61
    mir::test::AutoJoinThread server_thread;
61
    mir::test::AutoJoinThread server_thread;
16
62
62
17
63
    std::list<mir::Fd> connections;
18
64
19
65
    std::mutex mutex;
63
    std::mutex mutex;
20
66
    std::condition_variable started;
64
    std::condition_variable started;
21
67
    bool server_running{false};
65
    bool server_running{false};
22
68
66
23
=== modified file 'tests/mir_test_framework/async_server_runner.cpp'
24
--- tests/mir_test_framework/async_server_runner.cpp	2015-07-27 07:24:50 +0000
25
+++ tests/mir_test_framework/async_server_runner.cpp	2015-11-19 16:26:10 +0000
26
@@ -110,7 +110,6 @@
27
110
{
110
{
28
111
    server.stop();
111
    server.stop();
29
112
    wait_for_server_exit();
112
    wait_for_server_exit();
30
113
    connections.clear();
31
114
}
113
}
32
115
114
33
116
void mtf::AsyncServerRunner::wait_for_server_exit()
115
void mtf::AsyncServerRunner::wait_for_server_exit()
34
@@ -132,10 +131,12 @@
35
132
    return connection(server.open_client_socket());
131
    return connection(server.open_client_socket());
36
133
}
132
}
37
134
133
39
135
auto mtf::AsyncServerRunner::connection(mir::Fd fd) -> std::string
134
auto mtf::AsyncServerRunner::connection(int fd) -> std::string
40
136
{
135
{
41
137
    char connect_string[64] = {0};
136
    char connect_string[64] = {0};
44
138
    connections.push_back(fd);
137
    // We can't have both the server and the client owning the same fd, since
45
139
    sprintf(connect_string, "fd://%d", fd.operator int());
138
    // that will result in a double-close(). We give the client a duplicate which
46
139
    // the client can safely own (and should close when done).
47
140
    sprintf(connect_string, "fd://%d", dup(fd));
48
140
    return connect_string;
141
    return connect_string;
49
141
}
142
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-11-19
Alberto Aguirre (community)			Approve on 2015-11-19
Alan Griffiths		2015-11-19	Approve on 2015-11-19
Review via email: mp+278032@code.launchpad.net