/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_ping.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
"""External tests of 'brz ping'"""
18
18
 
19
19
import breezy
20
 
from breezy.sixish import PY3
21
20
from breezy import tests
22
21
 
23
22
 
33
32
        out, err = self.run_bzr(['ping', self.get_url('branch')])
34
33
        self.assertLength(1, self.hpss_calls)
35
34
        self.assertLength(1, self.hpss_connections)
36
 
        if PY3:
37
 
            self.assertEqual(out,
38
 
                             "Response: (b'ok', b'2')\n"
39
 
                             "Headers: {'Software version': '%s'}\n" % (breezy.version_string,))
40
 
        else:
41
 
            self.assertEqual(out,
42
 
                             "Response: ('ok', '2')\n"
43
 
                             "Headers: {u'Software version': u'%s'}\n" % (breezy.version_string,))
 
35
        self.assertEqual(out,
 
36
                         "Response: (b'ok', b'2')\n"
 
37
                         "Headers: {'Software version': '%s'}\n" % (breezy.version_string,))
44
38
        self.assertEqual(err, "")