Merge lp:~xnox/ubuntu-keyboard/clean-home into lp:ubuntu-keyboard

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 140
Proposed branch: lp:~xnox/ubuntu-keyboard/clean-home
Merge into: lp:ubuntu-keyboard
Diff against target: 20 lines (+9/-1)
1 file modified
debian/rules (+9/-1)
To merge this branch: bzr merge lp:~xnox/ubuntu-keyboard/clean-home
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Michael Terry Approve
Review via email: mp+193979@code.launchpad.net

Commit message

Tests expect writable /home/xnox, provide a fresh one for each build.

Description of the change

Tests expect writable /home/xnox, provide a fresh one for each build.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

To reproduce bug #1247994 run tests with a bogus non-writable $HOME e.g.

  $ HOME=/non-existant debuild

This fixes by creating a clean home before tests are run.
Maybe the test-suite harness should create & clean-up $HOME.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

... without this change ubuntu-keyboard FTBFS in stock sbuild.

lp:~xnox/ubuntu-keyboard/clean-home updated
101. By Dimitri John Ledkov

add comment

Revision history for this message
Michael Terry (mterry) wrote :

Works for me! Probably should be fixed more directly in tests, but this is a good way to unblock CI.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Ping. Why has this not been merged?

lp:~xnox/ubuntu-keyboard/clean-home updated
102. By Dimitri John Ledkov

merge trunk

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2013-11-15 09:54:21 +0000
3+++ debian/rules 2014-02-28 21:28:39 +0000
4@@ -16,7 +16,15 @@
5 CONFIG+=enable-pinyin
6
7 override_dh_auto_test:
8- xvfb-run -a make check
9+ # Tests write $HOME/.presage/lm.db, make sure $HOME is
10+ # writable.
11+ rm -rf $(CURDIR)/debian/test-home
12+ mkdir -p $(CURDIR)/debian/test-home
13+ HOME=$(CURDIR)/debian/test-home xvfb-run -a make check
14+
15+override_dh_clean:
16+ rm -rf $(CURDIR)/debian/test-home
17+ dh_clean
18
19 override_dh_install:
20 # install autopilot tests

Subscribers

People subscribed via source and target branches