/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/per_branch/test_branch.py

Fix a bunch of tests on python3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_branch.py
90
90
        br.fetch(wt.branch)
91
91
        br.generate_revision_history(rev3)
92
92
        for revision_id in [rev3, rev2, rev1]:
93
 
            self.assertIsInstance(revision_id, str)
 
93
            self.assertIsInstance(revision_id, bytes)
94
94
        last = br.last_revision()
95
95
        self.assertEqual(rev3, last)
96
 
        self.assertIsInstance(last, str)
 
96
        self.assertIsInstance(last, bytes)
97
97
        revno, last = br.last_revision_info()
98
98
        self.assertEqual(3, revno)
99
99
        self.assertEqual(rev3, last)
100
 
        self.assertIsInstance(last, str)
 
100
        self.assertIsInstance(last, bytes)
101
101
 
102
102
    def test_fetch_revisions(self):
103
103
        """Test fetch-revision operation."""
509
509
        br = self.make_branch('.')
510
510
        format = br._format
511
511
        network_name = format.network_name()
512
 
        self.assertIsInstance(network_name, str)
 
512
        self.assertIsInstance(network_name, bytes)
513
513
        # We want to test that the network_name matches the actual format on
514
514
        # disk. For local branches that means that using network_name as a key
515
515
        # in the registry gives back the same format. For remote branches we
619
619
    def test_get_child_submit_format_default(self):
620
620
        submit_format = self.get_branch().get_child_submit_format()
621
621
        self.assertTrue(submit_format is None or
622
 
                        isinstance(submit_format, str))
 
622
                        isinstance(submit_format, bytes))
623
623
 
624
624
    def test_get_child_submit_format(self):
625
625
        branch = self.get_branch()