← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_send.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-01 15:17:33 UTC
  • mto: (4498.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4501.
  • Revision ID: v.ladeuil+lp@free.fr-20090701151733-i34hbbl7e2e1ta2o
Fixed as per John's review.

* bzrlib/tests/blackbox/test_send.py:
(load_tests): Delete spurious spaces in dict() definition.
(TestSendStrictWithChanges.setUp): Clarify the intent and mean of
the parametrization.

* bzrlib/send.py:
(send): Oops, fix the error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
39
39
                )))
40
40
    changes_scenarios = [
41
41
        ('uncommitted',
42
 
         dict(_changes_type= '_uncommitted_changes')),
 
42
         dict(_changes_type='_uncommitted_changes')),
43
43
        ('pending_merges',
44
 
         dict(_changes_type= '_pending_merges')),
 
44
         dict(_changes_type='_pending_merges')),
45
45
        ('out-of-sync-trees',
46
 
         dict(_changes_type= '_out_of_sync_trees')),
 
46
         dict(_changes_type='_out_of_sync_trees')),
47
47
        ]
48
48
    tests.multiply_tests(changes_tests, changes_scenarios, result)
49
49
    # No parametrization for the remaining tests
363
363
 
364
364
    def setUp(self):
365
365
        super(TestSendStrictWithChanges, self).setUp()
366
 
        getattr(self, self._changes_type)()
 
366
        # load tests set _changes_types to the name of the method we want to
 
367
        # call now
 
368
        do_changes_func = getattr(self, self._changes_type)
 
369
        do_changes_func()
367
370
 
368
371
    def _uncommitted_changes(self):
369
372
        self.make_parent_and_local_branches()