Merge ~smoser/cloud-init:bug/run_test_net into cloud-init:master
Status: | Merged |
---|---|
Merged at revision: | 65e01b463cee0bdb8c8b415e78abfcc3262aad89 |
Proposed branch: | ~smoser/cloud-init:bug/run_test_net |
Merge into: | cloud-init:master |
Diff against target: |
338 lines (+55/-61) 5 files modified
tests/unittests/helpers.py (+27/-20) tests/unittests/test__init__.py (+6/-6) tests/unittests/test_atomic_helper.py (+2/-2) tests/unittests/test_distros/test_user_data_normalize.py (+0/-0) tests/unittests/test_net.py (+20/-33) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cloud-init Commiters | Pending | ||
Review via email: mp+315402@code.launchpad.net |
Commit message
tests: remove executable bit on test_net, so it runs, and fix it.
The test_user_
the executable bit set, and thus are skipped by nose by default.
We could set run with the --exe flag, but they should not have
gotten this way.
Other changes here:
* replace TempDirTestCase with CiTestCase, which has some nice
tmp_dir() and tmp_path() functions. Going forward the intent
is to have CiTestCase be the base test case for tests.
* test_net: switch to CiTestCase and fix usage that was
silently broken, because of exe bit.
* populate_dir: return the list of files that it writes rather
than having no return value.
* CiTestCase:
* support tmp_path("foo") that returns a full path to 'foo'
under a tmpdir.
* add tmp_dir() to get a temp dir and clean up.