~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 5171.2.3.

  • Committer: Vincent Ladeuil
  • Date: 2010-04-28 10:30:48 UTC
  • mto: (5190.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5191.
  • Revision ID: v.ladeuil+lp@free.fr-20100428103048-hqg32oksuuunesj2
Fixed as per Andrew's review.

* bzrlib/tests/blackbox/test_push.py:
(TestPushStrictMixin.assertPushFails): Ensure that the error
message mentions --no-strict.
(TestPushStrictMixin.assertPushSucceeds): Rely on branches only to
satisfy dpush needs. Check the warning in the error message.

* bzrlib/tests/blackbox/test_dpush.py:
(TestDpushStrictMixin): Simplified now that the base class do less
assumptions.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: