~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 4597.10.7

Rev	Summary	Authors	Date
4597.10.7	Simplify scenarios mirroring and give a better docstring for... Simplify scenarios mirroring and give a better docstring for TestParametrizedResolveConflicts. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts.mirror_scenarios): Better doc string. Stop flattening the dicts, embed them in the scenario instead.	Vincent Ladeuil	14 years ago
4597.10.6	Merge cleanup into more-tests Merge cleanup into more-tests	Vincent Ladeuil	14 years ago
4597.10.5	Merge 537956-parent-loop-incomplete into more-tests Merge 537956-parent-loop-incomplete into more-tests	Vincent Ladeuil	14 years ago
4597.10.4	Handle TestResolveParentLoop expected failures more precisel... Handle TestResolveParentLoop expected failures more precisely.	Vincent Ladeuil	14 years ago
4597.10.3	Remove ParentLoop blacbox tests. Remove ParentLoop blacbox tests.	Vincent Ladeuil	14 years ago
4597.10.2	Merge 537956-parent-loop-incomplete into more-tests Merge 537956-parent-loop-incomplete into more-tests	Vincent Ladeuil	14 years ago
4597.10.1	Refactor to better handle various conflict types. Refactor to better handle various conflict types. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts): Use _this_args and _other_args since different conflicts have different needs. Also get rid of _item_id and _item_path. Finally move all helpers to the relevant test conflict classes. All daughter classes now define their own semantic for the arguments associated with actions and implement the necessary hooks/specializations where relevant.	Vincent Ladeuil	14 years ago
4597.8.10	Add a NEWS entry. Add a NEWS entry.	Vincent Ladeuil	14 years ago
4597.8.9	Mark the expected failing tests as such. Mark the expected failing tests as such. * bzrlib/tests/test_conflicts.py: (TestResolveParentLoop.assertParentLoop): Crude way to raise the KnownFailure.	Vincent Ladeuil	14 years ago
4597.8.8	Exhibit bug #537956. Exhibit bug #537956. * bzrlib/conflicts.py: (ParentLoop.format): Fix parameter order to correctly reflect the attempted action leading to the conflict. * bzrlib/tests/test_conflicts.py: (TestResolveParentLoop.scenarios): Add one scenario with known failures.	Vincent Ladeuil	14 years ago
4597.8.7	Add whitebox tests for ParentLoop. Add whitebox tests for ParentLoop. * bzrlib/tests/test_conflicts.py: (TestParametrizedResolveConflicts.check_resolved): Allow the path passed to resolve to be specialized. (TestResolveParentLoop): Replace blackbox tests.	Vincent Ladeuil	14 years ago
4597.8.6	More precise test. More precise test. * bzrlib/tests/test_conflicts.py: (TestResolveDuplicateEntry.assertDuplicateEntry): Also check conflict_path.	Vincent Ladeuil	14 years ago
4597.8.5	Replace DuplicateEntry blackbox tests by whitebox ones. Replace DuplicateEntry blackbox tests by whitebox ones. * bzrlib/tests/test_conflicts.py: (TestResolveDuplicateEntry): Replace blackbox tests.	Vincent Ladeuil	14 years ago
4597.8.4	Delete PathConflict bloackbox tests. Delete PathConflict bloackbox tests. * bzrlib/tests/test_conflicts.py: (TestResolvePathConflict.scenarios): Add one more scenario to cover the old tests. (OldTestResolvePathConflict): Deleted.	Vincent Ladeuil	14 years ago
4597.8.3	Merge cleanup into 531967-unify-name-conflicts Merge cleanup into 531967-unify-name-conflicts	Vincent Ladeuil	14 years ago
4597.8.2	merge fix for 531967 merge fix for 531967	Vincent Ladeuil	14 years ago
4597.8.1	Fix doc string. Fix doc string. * bzrlib/conflicts.py: (ContentsConflict): Is used for binary files too.	Vincent Ladeuil	14 years ago
4597.7.5	Simplify resolve_conflict_scenarios. Simplify resolve_conflict_scenarios. * bzrlib/tests/test_conflicts.py: (resolve_conflict_scenarios): Enhance readability.	Vincent Ladeuil	14 years ago
4597.7.4	Abstract the test class some more to address more conflict Abstract the test class some more to address more conflict types. This currently fails test_resolve_taking_other(dir_renamed,dir_deleted) because the conflict object doesn't record the file-id involved. * bzrlib/tests/test_conflicts.py: (resolve_conflict_scenarios): Renamed from content_conflict_scenarios because we basically want to use the same tests for various conflict types. (TestParametrizedResolveConflicts): Add more attributes. (TestParametrizedResolveConflicts.setUp): Create a dir for other types of conflicts. (TestParametrizedResolveConflicts.assertConflict): Use the conflict type parameter instead of requiring the method parameter. (TestParametrizedResolveConflicts.do_rename_dir, TestParametrizedResolveConflicts.check_dir_renamed, TestParametrizedResolveConflicts.do_delete_dir, TestParametrizedResolveConflicts.check_dir_doesnt_exist): More helpers.	Vincent Ladeuil	14 years ago
4597.7.3	Fix typos, tests passing. Fix typos, tests passing.	Vincent Ladeuil	14 years ago

Older »