Mir

Merge lp://qastaging/~alan-griffiths/mir/frig-1283085 into lp://qastaging/mir

  1. frig-1283085
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 1422
Proposed branch: lp://qastaging/~alan-griffiths/mir/frig-1283085
Merge into: lp://qastaging/mir
Diff against target: 42 lines (+8/-8)
1 file modified
tests/unit-tests/graphics/mesa/test_display.cpp (+8/-8)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/frig-1283085
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alexandros Frantzis (community) Approve
Daniel van Vugt Approve
Review via email: mp+207682@code.qastaging.launchpad.net

Commit message

tests: Address some raciness in MesaDisplayTest.drm_device_change_event_triggers_handler

Description of the change

tests: Address some raciness in MesaDisplayTest.drm_device_change_event_triggers_handler

Fixes one race (touching the GTEST infrastructure from a thread) and hides some raciness in fake_devices and/or umockdev

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1418
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/920/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1014
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/650
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/657
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/657/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/607
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/607/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/581
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4195

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/920/rebuild

review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

(1) This sounds like a hack, should we be concerned?
   25 + // sleeping between calls to fake_devices hides race conditions
The sleep call already exists, so it's functionally no worse. Only the new comment could concern the reader.

(2) It's probably better practice to keep "<" instead of "!=" in loops like this:
   for (int i = 0; i != device_change_count; ++i)
Because that protects you from potential changes to i's initial conditions or increment.

Although if this fixes the bug then neither of those issues are worth blocking on.

review: Approve
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

OK for now. Hopefully, we can find and fix the root of the races at some point, especially since we have started to depend more on umockdev.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> (1) This sounds like a hack, should we be concerned?
> 25 + // sleeping between calls to fake_devices hides race
> conditions
> The sleep call already exists, so it's functionally no worse. Only the new
> comment could concern the reader.

And so it should. ;)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/405/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1020
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/614/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/310
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-autolanding/310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/311
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-autolanding/311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/615
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/615/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/589/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4223

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

"Cannot add PPA: 'ppa:chris.gagnon/mir-demo-tester'."

[Possibly intermittent] CI issue

reapproving

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches