Merge lp://staging/~nataliabidart/magicicada-client/run-tests-travis-docker-xenial into lp://staging/magicicada-client
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 1441 |
| Merged at revision: | 1440 |
| Proposed branch: | lp://staging/~nataliabidart/magicicada-client/run-tests-travis-docker-xenial |
| Merge into: | lp://staging/magicicada-client |
| Diff against target: |
95 lines (+31/-9) 5 files modified
.travis.yml (+7/-4) Dockerfile (+14/-0) Makefile (+5/-0) ubuntuone/syncdaemon/config.py (+2/-2) ubuntuone/syncdaemon/tests/test_config.py (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/magicicada-client/run-tests-travis-docker-xenial |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Facundo Batista | Approve | ||
|
Review via email:
|
|||
Commit message
- Provide docker rules to be able to build a xenial image and run tests in it.
- Fix failing test for config file parsing for when LANG=C.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Great!