-
Committer:
Vincent Ladeuil
-
Date:
2009-06-30 15:54:23 UTC
-
mto:
(4496.1.1 integration)
-
mto:
This revision was merged to the branch mainline in
revision
4497.
-
Revision ID:
v.ladeuil+lp@free.fr-20090630155423-afousrl3zrdx0he2
Fixed as per jam's review.
* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.
* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.
* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.