DBus Test Runner

Merge lp://staging/~mhr3/dbus-test-runner/watch-pipes-for-hup into lp://staging/dbus-test-runner/13.10

watch-pipes-for-hup
Merge into trunk.13.10

Proposed by Michal Hruby on 2013-07-21

Status:	Merged
Approved by:	Ted Gould on 2013-07-22
Approved revision:	75
Merged at revision:	65
Proposed branch:	lp://staging/~mhr3/dbus-test-runner/watch-pipes-for-hup
Merge into:	lp://staging/dbus-test-runner/13.10
Diff against target:	235 lines (+56/-20) 5 files modified libdbustest/Makefile.am (+2/-0) libdbustest/bustle.c (+1/-1) libdbustest/leash.c (+12/-11) libdbustest/process.c (+13/-5) libdbustest/service.c (+28/-3)
To merge this branch:	bzr merge lp://staging/~mhr3/dbus-test-runner/watch-pipes-for-hup
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-22
Ted Gould (community)			Approve on 2013-07-22
Alberto Mardegan (community)		2013-07-21	Approve on 2013-07-22
Review via email: mp+176092@code.staging.launchpad.net

Commit message

Watch created pipes for the G_IO_HUP event, as when a pipe closes, polling it will return this event.

Description of the change

Watch created pipes for the G_IO_HUP event, as when a pipe closes, polling it will return this event.

Without this patch, the test runner is somewhat racy as it expects to always get a child watch event before a pipe closing. Moreover not handling HUP can cause 100% CPU usage, since polling a closed pipe will keep returning POLLHUP and nothing in the code removed the pipe from the poll fds.

Also clean up the code in the watchdog process, use g_unix_signal_add, which plays nicer with glib's main loop.

Lastly, don't print empty line after each received line from the process tasks. :)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-21:

FAILED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbus-test-runner-ci/3/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-21:

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dbus-test-runner-ci/4/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alberto Mardegan (mardy) wrote on 2013-07-22:

116 + message = g_strdup_printf("Exitted with status %d", status);

"Exited"

Other than that, I tested your changes against one of my projects and it works just fine.
And the removal of the blank lines is invaluable, thanks! :-)

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-22:

FAILED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/dbus-test-runner-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-amd64-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-quantal-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-test-runner-saucy-armhf-ci/5