/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mail_client.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mail_client.py
97
97
        # We won't be able to know the temporary file name at this stage
98
98
        # so we can't raise an assertion with assertEqual
99
99
        cmdline = eclient._get_compose_commandline(None, None, 'file%')
100
 
        if eclient.elisp_tmp_file is not None:
101
 
            self.addCleanup(osutils.delete_any, eclient.elisp_tmp_file)
102
100
        commandline = ' '.join(cmdline)
103
101
        self.assertContainsRe(commandline, '--eval')
104
102
        self.assertContainsRe(commandline, '(compose-mail nil nil)')
109
107
        eclient = mail_client.EmacsMail(None)
110
108
        commandline = eclient._get_compose_commandline(u'jrandom@example.org',
111
109
            u'Hi there!', u'file%')
112
 
        if eclient.elisp_tmp_file is not None:
113
 
            self.addCleanup(osutils.delete_any, eclient.elisp_tmp_file)
114
110
        for item in commandline:
115
111
            self.assertFalse(isinstance(item, unicode),
116
112
                'Command-line item %r is unicode!' % item)