Merge lp:~jameinel/bzr/2.5-remote-wt-tests-1046697 into lp:bzr/2.5
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6509 |
Proposed branch: | lp:~jameinel/bzr/2.5-remote-wt-tests-1046697 |
Merge into: | lp:bzr/2.5 |
Diff against target: |
596 lines (+189/-76) 14 files modified
bzrlib/remote.py (+15/-6) bzrlib/smart/repository.py (+12/-9) bzrlib/tests/per_tree/__init__.py (+18/-4) bzrlib/tests/per_workingtree/__init__.py (+39/-6) bzrlib/tests/per_workingtree/test_commit.py (+3/-2) bzrlib/tests/per_workingtree/test_executable.py (+1/-2) bzrlib/tests/per_workingtree/test_parents.py (+5/-3) bzrlib/tests/per_workingtree/test_remove.py (+1/-1) bzrlib/tests/per_workingtree/test_smart_add.py (+3/-0) bzrlib/tests/per_workingtree/test_views.py (+2/-2) bzrlib/tests/per_workingtree/test_workingtree.py (+24/-29) bzrlib/tests/test_selftest.py (+39/-9) bzrlib/workingtree_4.py (+19/-3) doc/en/release-notes/bzr-2.5.txt (+8/-0) |
To merge this branch: | bzr merge lp:~jameinel/bzr/2.5-remote-wt-tests-1046697 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Richard Wilbur | Approve | ||
Review via email: mp+123061@code.launchpad.net |
Commit message
Add per_workingtree test scenario for a lightweight checkout of a RemoteRepository (bug #1046697) and cleanup all associated fallout.
Description of the change
This branch aggregates most of the branches I proposed today.
It adds a test permutation of a lightweight WT6 checkout of a remote repository.
That resulted in a fair number of tests failing for various reasons.
1) RemoteBranch.
2) RemoteBranch.
3) Repository.
4) Lots of test suite fixups. Quite a few tests
a) assumed that WT.branch was in the same location as WT
b) assumed that make_branch(
c) WorkingTreeForm
I only ran the per_workingtree tests, but that should be enough since that is the only new permutations that were added.
Lots of good fixes for working trees and tests. This looks like good stuff for the baseline. +1
Interesting behaviour from .iter_files_bytes() in get_file_text(): yielding empty results until the last result which contains the full contents of the file.
Nice cleanup on the progress bars.