1
=== modified file 'examples/server_example_test_client.cpp'
2
--- examples/server_example_test_client.cpp	2017-01-18 02:29:37 +0000
3
+++ examples/server_example_test_client.cpp	2017-01-19 13:42:06 +0000
4
@@ -95,8 +95,13 @@
5
95
    static const char* const test_timeout_opt = "test-timeout";
95
    static const char* const test_timeout_opt = "test-timeout";
6
96
    static const char* const test_timeout_descr = "Seconds to run before sending SIGTERM to client";
96
    static const char* const test_timeout_descr = "Seconds to run before sending SIGTERM to client";
7
97
97
8
98
    static const char* const test_shutdown_timeout_opt = "shutdown-timeout";
9
99
    static const char* const test_shutdown_timeout_descr =
10
100
        "Seconds to wait after sending SIGTERM to the client before considering the client hung";
11
101
12
98
    server.add_configuration_option(test_client_opt, test_client_descr, mir::OptionType::string);
102
    server.add_configuration_option(test_client_opt, test_client_descr, mir::OptionType::string);
13
99
    server.add_configuration_option(test_timeout_opt, test_timeout_descr, 10);
103
    server.add_configuration_option(test_timeout_opt, test_timeout_descr, 10);
14
104
    server.add_configuration_option(test_shutdown_timeout_opt, test_shutdown_timeout_descr, 1);
15
100
105
16
101
    server.add_init_callback([&server, &context]
106
    server.add_init_callback([&server, &context]
17
102
    {
107
    {
18
@@ -142,7 +147,11 @@
19
142
                    });
147
                    });
20
143
148
21
144
                context.client_kill_action->reschedule_in(std::chrono::seconds(options->get<int>(test_timeout_opt)));
149
                context.client_kill_action->reschedule_in(std::chrono::seconds(options->get<int>(test_timeout_opt)));
23
145
                context.server_stop_action->reschedule_in(std::chrono::seconds(options->get<int>(test_timeout_opt)+1));
150
                //give a generous 3s for clients to finish their shutdown to avoid burdened
24
151
                //test machines from reporting failure when the clients are just taking a long time
25
152
                //to shutdown (LP: #1560909)
26
153
                context.server_stop_action->reschedule_in(std::chrono::seconds(
27
154
                    options->get<int>(test_timeout_opt)+ options->get<int>(test_shutdown_timeout_opt)));
28
146
            }
155
            }
29
147
            else
156
            else
30
148
            {
157
            {
Reviewer	Review Type	Date Requested	Status
Alan Griffiths		2017-01-18	Disapprove on 2017-01-23
Daniel van Vugt			Needs Information on 2017-01-23
Alberto Aguirre (community)			Abstain on 2017-01-21
Mir CI Bot	continuous-integration		Needs Fixing on 2017-01-21
Cemil Azizoglu (community)			Approve on 2017-01-19
Review via email: mp+315034@code.launchpad.net