webbrowser-app

Merge lp:~osomon/webbrowser-app/fix-ut-sbuild into lp:webbrowser-app

fix-ut-sbuild
Merge into trunk

Proposed by Olivier Tilloy on 2016-04-07

Status:

Merged

Approved by:

Olivier Tilloy on 2016-04-08

Approved revision:

1401

Merged at revision:

1411

Proposed branch:

lp:~osomon/webbrowser-app/fix-ut-sbuild

Merge into:

lp:webbrowser-app

Diff against target:

38 lines (+13/-0)

2 files modified

debian/rules (+11/-0)
src/app/single-instance-manager.cpp (+2/-0)

To merge this branch:

bzr merge lp:~osomon/webbrowser-app/fix-ut-sbuild

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ken VanDine	packaging	2016-04-07	Approve on 2016-04-08
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-04-08
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-04-08
Review via email: mp+291218@code.launchpad.net

Commit message

Fix unit tests when run under an sbuild chroot.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-04-07:

FAILED: Continuous integration, rev:1399
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2683/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6804/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6815/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2683/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-04-08:

FAILED: Continuous integration, rev:1399
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/337/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/337/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/337
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/337
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/337
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/337/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/337/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/337/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/337/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/337/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/337/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/337/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/fix-ut-sbuild updated on 2016-04-08

1400. By Olivier Tilloy on 2016-04-08: Make BUILDHOME a shorter path to try and comply with the 108 characters limit for a unix domain socket pathname (used by the single instance manager code).

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-04-08:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/340/rebuild

review: Needs Fixing (continuous-integration)

lp:~osomon/webbrowser-app/fix-ut-sbuild updated on 2016-04-08

1401. By Olivier Tilloy on 2016-04-08: Add a comment for future improvements to the implementation of SingleInstanceManager.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-04-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2686/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-04-08:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/341/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-04-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2687/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2016-04-08:

Looks good!

review: Approve (packaging)

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:

Olivier Tilloy

Ubuntu Phablet Team

to status/vote changes:

Rachel Liu

1	=== modified file 'debian/rules'
2	--- debian/rules 2016-01-29 09:25:23 +0000
3	+++ debian/rules 2016-04-08 13:49:39 +0000
4	@@ -7,6 +7,8 @@
5	export DEB_BUILD_HARDENING=1
6	export DPKG_GENSYMBOLS_CHECK_LEVEL=4
7
8	+BUILDHOME=/tmp/home
9	+
10	%:
11	dh $@ --parallel --with translations
12
13	@@ -32,3 +34,12 @@
14	# Unfortunately, the default build directory is not exposed
15	# (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601774).
16	$(MAKE) -C obj-$(DEB_HOST_GNU_TYPE) webbrowser-app.pot
17	+
18	+override_dh_clean:
19	+ dh_clean
20	+ rm -rf $(BUILDHOME)
21	+
22	+override_dh_auto_test:
23	+ mkdir -p $(BUILDHOME)
24	+ HOME=$(BUILDHOME) dh_auto_test
25	+
26
27	=== modified file 'src/app/single-instance-manager.cpp'
28	--- src/app/single-instance-manager.cpp 2016-01-18 14:45:12 +0000
29	+++ src/app/single-instance-manager.cpp 2016-04-08 13:49:39 +0000
30	@@ -69,6 +69,8 @@
31	}
32	}
33	QString name = profile.absoluteFilePath(QStringLiteral("SingletonSocket"));
34	+ // XXX: Unix domain sockets limit the length of the pathname to 108 characters.
35	+ // We should probably handle QAbstractSocket::HostNotFoundError explicitly.
36
37	if (listen(name)) {
38	return true;

webbrowser-app

Merge lp:~osomon/webbrowser-app/fix-ut-sbuild into lp:webbrowser-app

Commit message

Description of the change

Preview Diff

Subscribers