BAMF

Merge lp:~3v1n0/bamf/tests-dbus-cleanup-0.4 into lp:bamf/0.4

  1. tests-dbus-cleanup-0.4
  2. Merge into 0.4
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Francis Ginther
Approved revision: 540
Merged at revision: 540
Proposed branch: lp:~3v1n0/bamf/tests-dbus-cleanup-0.4
Merge into: lp:bamf/0.4
Prerequisite: lp:~3v1n0/bamf/xunit-coverage-fixes-0.4
Diff against target: 15 lines (+5/-1)
1 file modified
tests/Makefile.am.gtests (+5/-1)
To merge this branch: bzr merge lp:~3v1n0/bamf/tests-dbus-cleanup-0.4
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Francis Ginther Approve
Review via email: mp+168251@code.launchpad.net

This proposal supersedes a proposal from 2013-06-08.

Commit message

Makefile.am.gtests: kill the launched dbus-daemon after running the tests

Description of the change

Backporting to 0.4 branch of lp:~3v1n0/bamf/tests-dbus-cleanup/+merge/168247

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

FAILED: Continuous integration, rev:539
http://jenkins.qa.ubuntu.com/job/bamf-0.4-ci/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-0.4-raring-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-0.4-raring-armhf-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-0.4-ci/6/rebuild

review: Needs Fixing (continuous-integration)
lp:~3v1n0/bamf/tests-dbus-cleanup-0.4 updated
540. By Marco Trevisan (Treviño)

Merging with lp:~3v1n0/bamf/xunit-coverage-fixes-0.4

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

PASSED: Continuous integration, rev:540
http://jenkins.qa.ubuntu.com/job/bamf-0.4-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-0.4-raring-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-0.4-raring-armhf-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-0.4-ci/8/rebuild

review: Approve (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Reviewed and tested in pbuilder, approve.

review: Approve
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
1=== modified file 'tests/Makefile.am.gtests'
2--- tests/Makefile.am.gtests 2013-06-08 17:39:26 +0000
3+++ tests/Makefile.am.gtests 2013-06-08 17:39:26 +0000
4@@ -24,7 +24,11 @@
5 $(DBUS_LAUNCH) > $(LOG_PATH)/sessionbus.sh; \
6 source $(LOG_PATH)/sessionbus.sh; \
7 \
8- make $(AM_MAKEFLAGS) -k test
9+ make $(AM_MAKEFLAGS) -k test;
10+ \
11+ source $(LOG_PATH)/sessionbus.sh; \
12+ rm $(LOG_PATH)/sessionbus.sh; \
13+ kill $$DBUS_SESSION_BUS_PID;
14
15 check-local: test-headless
16

Subscribers

People subscribed via source and target branches