/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/plugins/upload/tests/test_upload.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6928 work)
  • mto: (6940.2.6 base)
  • mto: This revision was merged to the branch mainline in revision 6941.
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
825
825
 
826
826
    def make_diverged_tree_and_upload_location(self):
827
827
        tree_a = self.make_branch_and_tree('tree_a')
828
 
        tree_a.commit('message 1', rev_id='rev1')
829
 
        tree_a.commit('message 2', rev_id='rev2a')
 
828
        tree_a.commit('message 1', rev_id=b'rev1')
 
829
        tree_a.commit('message 2', rev_id=b'rev2a')
830
830
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
831
831
        uncommit.uncommit(tree_b.branch, tree=tree_b)
832
 
        tree_b.commit('message 2', rev_id='rev2b')
 
832
        tree_b.commit('message 2', rev_id=b'rev2b')
833
833
        # upload tree a
834
834
        self.do_full_upload(directory=tree_a.basedir)
835
835
        return tree_b
843
843
        self.assertRaises(cmds.DivergedUploadedTree,
844
844
                          self.do_incremental_upload,
845
845
                          directory=self.diverged_tree.basedir)
846
 
        self.assertRevidUploaded('rev2a')
 
846
        self.assertRevidUploaded(b'rev2a')
847
847
 
848
848
    def test_upload_diverged_with_overwrite(self):
849
849
        self.do_incremental_upload(directory=self.diverged_tree.basedir,
850
850
                                   overwrite=True)
851
 
        self.assertRevidUploaded('rev2b')
 
851
        self.assertRevidUploaded(b'rev2b')
852
852
 
853
853
 
854
854
class TestUploadBadRemoteReivd(tests.TestCaseWithTransport, UploadUtilsMixin):