← 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: 2010-01-25 15:55:48 UTC
  • mto: (4985.1.4 add-attr-cleanup)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125155548-0l352pujvt5bzl5e
Deploy addAttrCleanup on the whole test suite.

Several use case worth mentioning:

- setting a module or any other object attribute is the majority
by far. In some cases the setting itself is deferred but most of
the time we want to set at the same time we add the cleanup.

- there multiple occurrences of protecting hooks or ui factory
which are now useless (the test framework takes care of that now),

- there was some lambda uses that can now be avoided.

That first cleanup already simplifies things a lot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
67
67
 
68
68
    def get_MD(self, args, cmd=None, wd='branch'):
69
69
        out = StringIO(self.run_send(args, cmd=cmd, wd=wd)[0])
70
 
        return merge_directive.MergeDirective.from_lines(out.readlines())
 
70
        return merge_directive.MergeDirective.from_lines(out)
71
71
 
72
72
    def assertBundleContains(self, revs, args, cmd=None, wd='branch'):
73
73
        md = self.get_MD(args, cmd=cmd, wd=wd)
280
280
        self.assertEqual('rev3', md.revision_id)
281
281
 
282
282
    def test_nonexistant_branch(self):
283
 
        if sys.platform == "win32":
284
 
            location = "C:/i/do/not/exist/"
285
 
        else:
286
 
            location = "/i/do/not/exist/"
 
283
        self.vfs_transport_factory = tests.MemoryServer
 
284
        location = self.get_url('absentdir/')
287
285
        out, err = self.run_bzr(["send", "--from", location], retcode=3)
288
286
        self.assertEqual(out, '')
289
287
        self.assertEqual(err, 'bzr: ERROR: Not a branch: "%s".\n' % location)
324
322
        out, err = self.run_send(args)
325
323
        self.assertEquals(
326
324
            'Bundling %d revision(s).\n' % len(revs), err)
327
 
        md = merge_directive.MergeDirective.from_lines(
328
 
                StringIO(out).readlines())
 
325
        md = merge_directive.MergeDirective.from_lines(StringIO(out))
329
326
        self.assertEqual('parent', md.base_revision_id)
330
327
        br = serializer.read_bundle(StringIO(md.get_raw_bundle()))
331
328
        self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
425
422
        self.assertSendFails([])
426
423
        self.assertSendSucceeds(['--no-strict'])
427
424
 
428
 
    def test_push_strict_command_line_override_config(self):
 
425
    def test_send_strict_command_line_override_config(self):
429
426
        self.set_config_send_strict('false')
430
427
        self.assertSendSucceeds([])
431
428
        self.assertSendFails(['--strict'])