lp:~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/handle-invalid-removed-file
- Get this branch:
- bzr branch lp:~jamesodhunt/ubuntu/vivid/ubuntu-core-upgrader/handle-invalid-removed-file
Branch merges
- Michael Vogt (community): Needs Information
-
Diff: 406 lines (+157/-56)5 files modifieddebian/changelog (+9/-0)
functional/test_upgrader.py (+78/-20)
ubuntucoreupgrader/tests/test_upgrader.py (+46/-10)
ubuntucoreupgrader/tests/utils.py (+6/-3)
ubuntucoreupgrader/upgrader.py (+18/-23)
Related bugs
Related blueprints
Branch information
- Owner:
- James Hunt
- Status:
- Development
Recent revisions
- 25. By James Hunt
-
* functional/
test_upgrader. py:
- call_upgrader(): Set created objects cache_dir to the root_dir to
allow the caller to check for deletion.
- Updated tests which remove files to pass in correct root dir to
upgrader.
- test_remove_file(): Fixed incorrect assertion.
* ubuntucoreupgrader/tests/ test_upgrader. py:
- test_empty_removed_ file(): New test.
* ubuntucoreupgrader/tests/ utils.py:
- add_to_removed_ file(): Call os.path.normpath().
- setUp(): Create system sub-dir to simplify creating files the
upgrader can manipulate.
* ubuntucoreupgrader/upgrader. py:
- Only call get_cache_dir() once in constructor. This saves needless
calls and makes testing easier.
- _cmd_update(): Use a single code path regardless of the specified
root to ensure the tests mirror the real upgrader logic. - 23. By James Hunt
-
ubuntucoreupgra
der/upgrader. py: Tolerate an invalid 'removed' file
to avoid the upgrade failing attempting to remove '/writable/cache'
(see LP: #1437225).
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/vivid/ubuntu-core-upgrader