← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mail_client.py

  • Committer: Vincent Ladeuil
  • Date: 2009-09-02 08:26:27 UTC
  • mto: (4669.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4670.
  • Revision ID: v.ladeuil+lp@free.fr-20090902082627-cit8vm6tefu9hwk2
Cleanup emacs-bzr-send-XXXXXX.el leaks in /tmp during selftest.

* tests/test_mail_client.py:
(TestEmacsMail.test_commandline,
TestEmacsMail.test_commandline_is_8bit): Cleanup the generated tmp
file.

* mail_client.py:
(EmacsMail.__init__, EmacsMail._get_compose_commandline): Keep
track of the tmp file to ease cleanup during testing.

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)
100
102
        commandline = ' '.join(cmdline)
101
103
        self.assertContainsRe(commandline, '--eval')
102
104
        self.assertContainsRe(commandline, '(compose-mail nil nil)')
107
109
        eclient = mail_client.EmacsMail(None)
108
110
        commandline = eclient._get_compose_commandline(u'jrandom@example.org',
109
111
            u'Hi there!', u'file%')
 
112
        if eclient.elisp_tmp_file is not None:
 
113
            self.addCleanup(osutils.delete_any, eclient.elisp_tmp_file)
110
114
        for item in commandline:
111
115
            self.assertFalse(isinstance(item, unicode),
112
116
                'Command-line item %r is unicode!' % item)