Mir

Merge lp:~alan-griffiths/mir/workaround-1502782 into lp:mir

workaround-1502782
Merge into development-branch

Proposed by Alan Griffiths on 2015-10-15

Status:

Merged

Approved by:

Daniel van Vugt on 2015-10-19

Approved revision:

3028

Merged at revision:

3032

Proposed branch:

lp:~alan-griffiths/mir/workaround-1502782

Merge into:

lp:mir

Diff against target:

12 lines (+4/-0)

1 file modified

tests/integration-tests/graphics/android/test_android_hardware_sanity.cpp (+4/-0)

To merge this branch:

bzr merge lp:~alan-griffiths/mir/workaround-1502782

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-10-19
Chris Halse Rogers			Approve on 2015-10-19
Kevin DuBois (community)			Approve on 2015-10-16
Daniel van Vugt			Approve on 2015-10-16
Cemil Azizoglu (community)		2015-10-15	Approve on 2015-10-15
Review via email: mp+274564@code.launchpad.net

Commit Message

tests: workaround for racy teardown of test case. (Which tears down drivers)

Description of the Change

tests: workaround for racy teardown of test case. (Which tears down drivers)

Andreas Pokorny (andreas-pokorny) wrote on 2015-10-15:

how about adding the delay to a QuirkedBufferAllocator::~QuirkedBufferAllocator?

PS Jenkins bot (ps-jenkins) wrote on 2015-10-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5277/rebuild

review: Needs Fixing (continuous-integration)

Andreas Pokorny (andreas-pokorny) wrote on 2015-10-15:

> how about adding the delay to a
> QuirkedBufferAllocator::~QuirkedBufferAllocator?

Did that and it didnt help for the 'other' problem in lp:1506137

PS Jenkins bot (ps-jenkins) wrote on 2015-10-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5278/rebuild

review: Approve (continuous-integration)

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-10-15:

review: Approve

Daniel van Vugt (vanvugt) wrote on 2015-10-16:

Can't hurt..?

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-10-16:

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2015-10-16:

Unrelated (reapproving):

+ sudo add-apt-repository --yes ppa:ci-train-ppa-service/stable-phone-overlay
Traceback (most recent call last):
  File "/usr/lib/python3.4/urllib/request.py", line 1182, in do_open
    h.request(req.get_method(), req.selector, req.data, headers)
  File "/usr/lib/python3.4/http/client.py", line 1088, in request
    self._send_request(method, url, body, headers)
  File "/usr/lib/python3.4/http/client.py", line 1126, in _send_request
    self.endheaders(body)
  File "/usr/lib/python3.4/http/client.py", line 1084, in endheaders
    self._send_output(message_body)
  File "/usr/lib/python3.4/http/client.py", line 922, in _send_output
    self.send(msg)
  File "/usr/lib/python3.4/http/client.py", line 857, in send
    self.connect()
  File "/usr/lib/python3.4/http/client.py", line 1223, in connect
    super().connect()
  File "/usr/lib/python3.4/http/client.py", line 834, in connect
    self.timeout, self.source_address)
  File "/usr/lib/python3.4/socket.py", line 494, in create_connection
    for res in getaddrinfo(host, port, 0, SOCK_STREAM):
  File "/usr/lib/python3.4/socket.py", line 533, in getaddrinfo
    for res in _socket.getaddrinfo(host, port, family, type, proto, flags):
socket.gaierror: [Errno -3] Temporary failure in name resolution

During handling of the above exception, another exception occurred:

Traceback (most recent call last):

PS Jenkins bot (ps-jenkins) wrote on 2015-10-16:

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2015-10-16:

Another unrelated (and strange) failure...

Running main() from main.cpp
[0;32m[==========] [mRunning 1 test from 1 test case.
[0;32m[----------] [mGlobal test environment set-up.
[0;32m[----------] [m1 test from GLMark2Test
[0;32m[ RUN ] [mGLMark2Test.benchmark_fullscreen_default
[1444988723.753888] mirplatform: Found graphics driver: android
[1444988723.754672] mirplatform: Found graphics driver: mesa-kms
[1444988723.756223] mirplatform: Found graphics driver: mesa-x11
[1444988723.756658] mirplatform: Found graphics driver: dummy
ERROR: Throw location unknown (consider using BOOST_THROW_EXCEPTION)
Dynamic exception type: N5boost16exception_detail10clone_implINS0_19error_info_injectorINS_6system12system_errorEEEEE
std::exception::what: bind: No such file or directory

unknown file: Failure
C++ exception with description "Failed to start server thread" thrown in SetUp().
[0;31m[ FAILED ] [mGLMark2Test.benchmark_fullscreen_default (10065 ms)
[0;32m[----------] [m1 test from GLMark2Test (10065 ms total)

[0;32m[----------] [mGlobal test environment tear-down
[0;32m[==========] [m1 test from 1 test case ran. (10066 ms total)
[0;32m[ PASSED ] [m0 tests.
[0;31m[ FAILED ] [m1 test, listed below:
[0;31m[ FAILED ] [mGLMark2Test.benchmark_fullscreen_default

PS Jenkins bot (ps-jenkins) wrote on 2015-10-16:

review: Needs Fixing (continuous-integration)

Kevin DuBois (kdub) wrote on 2015-10-16:

alright, but lets leave the bug open so its revisited.

review: Approve

Chris Halse Rogers (raof) wrote on 2015-10-19:

Let's try landing this sucker *again*...

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-10-19:

review: Needs Fixing (continuous-integration)

Daniel van Vugt (vanvugt) wrote on 2015-10-19:

6: /mir/tools/detect_fd_leaks.bash: line 84: 5536 Segmentation fault (core dumped) $@ 2>&1

Try again.

PS Jenkins bot (ps-jenkins) on 2015-10-19:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

1	=== modified file 'tests/integration-tests/graphics/android/test_android_hardware_sanity.cpp'
2	--- tests/integration-tests/graphics/android/test_android_hardware_sanity.cpp 2015-10-05 02:18:18 +0000
3	+++ tests/integration-tests/graphics/android/test_android_hardware_sanity.cpp 2015-10-15 14:28:22 +0000
4	@@ -281,4 +281,8 @@
5	//TODO: kdub it is a bit trickier to test that a gpu can render... just check creation for now
6	auto test_buffer = runner->config.the_buffer_allocator()->alloc_buffer(hw_properties);
7	EXPECT_NE(nullptr, test_buffer);
8	+
9	+ // Workaround for lp:1502782
10	+ test_buffer.reset();
11	+ std::this_thread::sleep_for(std::chrono::milliseconds(10));
12	}