/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 breezy/tests/blackbox/test_export_pot.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 01:51:19 UTC
  • mfrom: (6973.14.14 python3-m)
  • Revision ID: breezy.the.bot@gmail.com-20180703015119-8wqoc0wqw45irl6r
Fix more tests on Python3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-m/+merge/348800

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_export_pot.py
26
26
 
27
27
    def test_export_pot(self):
28
28
        out, err = self.run_bzr("export-pot")
29
 
        self.assertContainsRe(err, 'Exporting messages from builtin command: add')
30
 
        self.assertContainsRe(out, "help of 'change' option\n"\
31
 
                                   "msgid \"Select changes introduced by the specified revision.")
 
29
        self.assertContainsRe(err, b'Exporting messages from builtin command: add')
 
30
        self.assertContainsRe(out, b"help of 'change' option\n"\
 
31
                                   b"msgid \"Select changes introduced by the specified revision.")
32
32
 
33
33
    def test_export_pot_plugin_unknown(self):
34
34
        out, err = self.run_bzr("export-pot --plugin=lalalala", retcode=3)
35
35
        self.assertContainsRe(
36
 
             err, 'ERROR: Plugin lalalala is not loaded')
 
36
             err, b'ERROR: Plugin lalalala is not loaded')
37
37
 
38
38
    def test_export_pot_plugin(self):
39
39
        self.requireFeature(PluginLoadedFeature('launchpad'))
40
40
        out, err = self.run_bzr("export-pot --plugin=launchpad")
41
 
        self.assertContainsRe(err, 'Exporting messages from plugin command: launchpad-login in launchpad')
42
 
        self.assertContainsRe(out, 'msgid "Show or set the Launchpad user ID."')
 
41
        self.assertContainsRe(err, b'Exporting messages from plugin command: launchpad-login in launchpad')
 
42
        self.assertContainsRe(out, b'msgid "Show or set the Launchpad user ID."')