Merge lp:~jamesodhunt/upstart/check-for-overlayfs into lp:upstart
Status: | Merged |
---|---|
Merged at revision: | 1560 |
Proposed branch: | lp:~jamesodhunt/upstart/check-for-overlayfs |
Merge into: | lp:upstart |
Diff against target: |
191 lines (+156/-3) 4 files modified
ChangeLog (+13/-1) test/Makefile.am (+14/-1) test/test_util_common.c (+1/-1) test/tests/test_util_check_env.c (+128/-0) |
To merge this branch: | bzr merge lp:~jamesodhunt/upstart/check-for-overlayfs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Steve Langasek | Needs Fixing | ||
Review via email: mp+191393@code.launchpad.net |
Description of the change
* test/tests/
overlayfs filesystems which could cause tests to fail.
* test/Makefile.am: Added test_util_check_env meta-test.
* test/test_
This branch introduces a new meta-test that currently checks for overlayfs. It will produce a warning that tests will probably fail (due to bug LP:#882147) but does not actually abort the test run since:
- the invoker may know better whether a particular FS could cause problems for the tests.
- overlayfs may one day get fixed so hard-failing would be incorrect behaviour.
Note that the new test will be run before any other test. Further, note that since the overlayfs check is a separate test, if an individual test is run in an overlayfs environment, the invoker may be unaware of the strange resultant test failures. However, having a separate test does mean that we avoid linking every test against libnih-dbus et al.
does not merge cleanly, please sync with trunk and resubmit.