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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-07 21:24:40 UTC
  • mfrom: (7058.4.30 python3-x)
  • Revision ID: breezy.the.bot@gmail.com-20180807212440-m7r0c45ihwr0kcre
Fix another round of tests on Python 3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bzrdir.py
1227
1227
            raise TestSkipped('unable to make file hidden without pywin32 library')
1228
1228
        b = bzrdir.BzrDir.create('.')
1229
1229
        self.build_tree(['a'])
1230
 
        self.assertEqual(['a'], self.get_ls())
 
1230
        self.assertEqual([b'a'], self.get_ls())
1231
1231
 
1232
1232
    def test_dot_bzr_hidden_with_url(self):
1233
1233
        if sys.platform == 'win32' and not win32utils.has_win32file:
1234
1234
            raise TestSkipped('unable to make file hidden without pywin32 library')
1235
1235
        b = bzrdir.BzrDir.create(urlutils.local_path_to_url('.'))
1236
1236
        self.build_tree(['a'])
1237
 
        self.assertEqual(['a'], self.get_ls())
 
1237
        self.assertEqual([b'a'], self.get_ls())
1238
1238
 
1239
1239
 
1240
1240
class _TestBzrDirFormat(bzrdir.BzrDirMetaFormat1):
1404
1404
        self.assertEqual("a.~1~", self._bzrdir._available_backup_name("a"))
1405
1405
 
1406
1406
    def test_exiting(self):
1407
 
        self._transport.put_bytes("a.~1~", "some content")
 
1407
        self._transport.put_bytes("a.~1~", b"some content")
1408
1408
        self.assertEqual("a.~2~", self._bzrdir._available_backup_name("a"))
1409
1409
 
1410
1410
 
1474
1474
        self.assertEqual(format.as_string(),
1475
1475
            b"First line\n"
1476
1476
            b"required foo\n")
1477
 
        format.features["another"] = "optional"
 
1477
        format.features[b"another"] = b"optional"
1478
1478
        self.assertEqual(format.as_string(),
1479
1479
            b"First line\n"
1480
1480
            b"optional another\n"