Merge lp:~ken-vandine/content-hub/home_dir_for_tests into lp:content-hub

Proposed by Ken VanDine
Status: Approved
Approved by: Christopher Townsend
Approved revision: 336
Proposed branch: lp:~ken-vandine/content-hub/home_dir_for_tests
Merge into: lp:content-hub
Diff against target: 26 lines (+3/-2)
2 files modified
debian/rules (+2/-1)
tests/acceptance-tests/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/content-hub/home_dir_for_tests
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Christopher Townsend Approve
Review via email: mp+321894@code.launchpad.net

Commit message

Set $HOME when running tests

Description of the change

Set $HOME when running tests

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

Seems reasonable as a workaround for the missing HOME env var on random builds.

review: Approve
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
337. By Ken VanDine

Run dbus-test-runner with --keep-env to ensure the environment is not cleared

Unmerged revisions

337. By Ken VanDine

Run dbus-test-runner with --keep-env to ensure the environment is not cleared

336. By Ken VanDine

Set $HOME when running tests

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 2017-03-15 13:30:11 +0000
3+++ debian/rules 2017-04-04 19:04:35 +0000
4@@ -14,7 +14,8 @@
5 dh $@ --with translations --fail-missing -- -B build
6
7 override_dh_auto_test:
8- make -C build/tests/acceptance-tests test
9+ TEST_HOME=`mktemp -d`
10+ HOME=$(TEST_HOME) make -C build/tests/acceptance-tests test
11
12 override_dh_auto_install:
13 dh_auto_install
14
15=== modified file 'tests/acceptance-tests/CMakeLists.txt'
16--- tests/acceptance-tests/CMakeLists.txt 2017-03-15 12:54:42 +0000
17+++ tests/acceptance-tests/CMakeLists.txt 2017-04-04 19:04:35 +0000
18@@ -64,7 +64,7 @@
19 ${TEST_LIBS}
20 )
21
22- add_test(NAME ${test} COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/${test})
23+ add_test(NAME ${test} COMMAND dbus-test-runner --keep-env --task ${CMAKE_CURRENT_BINARY_DIR}/${test})
24
25 SET_TESTS_PROPERTIES(${test}
26 PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")

Subscribers

People subscribed via source and target branches