Mir

Merge lp:~alan-griffiths/mir/enable-FD-leak-checking-for-acceptance-tests into lp:mir

  1. enable-FD-leak-checking-for-acceptance-tests
  2. Merge into development-branch
Proposed by Alan Griffiths on 2015-07-29
Status: Merged
Approved by: Alan Griffiths on 2015-07-29
Approved revision: 2794
Merged at revision: 2795
Proposed branch: lp:~alan-griffiths/mir/enable-FD-leak-checking-for-acceptance-tests
Merge into: lp:mir
Prerequisite: lp:~alan-griffiths/mir/label-tests-where-processes-abort-as-DeathTest
Diff against target: 38 lines (+5/-1)
2 files modified
tests/acceptance-tests/CMakeLists.txt (+1/-1)
tests/acceptance-tests/test_server_disconnect.cpp (+4/-0)
To merge this branch: bzr merge lp:~alan-griffiths/mir/enable-FD-leak-checking-for-acceptance-tests
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Approve on 2015-07-29
Kevin DuBois (community) 2015-07-29 Approve on 2015-07-29
PS Jenkins bot continuous-integration Approve on 2015-07-29
Review via email: mp+266208@code.launchpad.net

Commit Message

tests: Enable FD leak detection in acceptance tests

Description of the Change

tests: Enable FD leak detection in acceptance tests

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/acceptance-tests/CMakeLists.txt'
2--- tests/acceptance-tests/CMakeLists.txt 2015-07-27 07:24:50 +0000
3+++ tests/acceptance-tests/CMakeLists.txt 2015-07-29 10:35:43 +0000
4@@ -91,5 +91,5 @@
5 OFF)
6
7 if (MIR_RUN_ACCEPTANCE_TESTS)
8- mir_discover_tests(mir_acceptance_tests)
9+ mir_discover_tests_with_fd_leak_detection(mir_acceptance_tests)
10 endif (MIR_RUN_ACCEPTANCE_TESTS)
11
12=== modified file 'tests/acceptance-tests/test_server_disconnect.cpp'
13--- tests/acceptance-tests/test_server_disconnect.cpp 2015-07-29 10:35:43 +0000
14+++ tests/acceptance-tests/test_server_disconnect.cpp 2015-07-29 10:35:43 +0000
15@@ -32,6 +32,7 @@
16
17 namespace mtf = mir_test_framework;
18 namespace mt = mir::test;
19+using namespace testing;
20
21 namespace
22 {
23@@ -97,6 +98,7 @@
24 {
25 sync.wait_for_signal_ready_for();
26 stop_server();
27+ EXPECT_THAT(client->wait_for_termination().exit_code, Eq(EXIT_SUCCESS));
28 }
29 }
30
31@@ -152,6 +154,8 @@
32 configure_display();
33 /* Trying to disconnect at this point shouldn't block */
34 disconnect();
35+
36+ EXPECT_THAT(client->wait_for_termination().exit_code, Eq(EXIT_SUCCESS));
37 }
38 }
39

Subscribers

People subscribed via source and target branches