/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: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_ping.py
17
17
"""External tests of 'brz ping'"""
18
18
 
19
19
import breezy
 
20
from breezy.sixish import PY3
20
21
from breezy import tests
21
22
 
22
23
 
32
33
        out, err = self.run_bzr(['ping', self.get_url('branch')])
33
34
        self.assertLength(1, self.hpss_calls)
34
35
        self.assertLength(1, self.hpss_connections)
35
 
        self.assertEqual(out,
36
 
                         "Response: (b'ok', b'2')\n"
37
 
                         "Headers: {'Software version': '%s'}\n" % (breezy.version_string,))
 
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,))
38
44
        self.assertEqual(err, "")