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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_smart.py
1105
1105
        self.tree.add('')
1106
1106
        rev_id_utf8 = u'\xc8'.encode('utf-8')
1107
1107
        r1 = self.tree.commit('1st commit', rev_id=rev_id_utf8)
1108
 
        r2 = self.tree.commit('2nd commit', rev_id='rev-2')
 
1108
        r2 = self.tree.commit('2nd commit', rev_id=b'rev-2')
1109
1109
        self.tree.unlock()
1110
1110
 
1111
1111
    def test_branch_last_revision_info_is_updated(self):
1236
1236
        self.tree.add('')
1237
1237
        r1 = self.tree.commit('1st commit')
1238
1238
        revno_1, revid_1 = self.tree.branch.last_revision_info()
1239
 
        r2 = self.tree.commit('2nd commit', rev_id='child-1')
 
1239
        r2 = self.tree.commit('2nd commit', rev_id=b'child-1')
1240
1240
        # Undo the second commit
1241
1241
        self.tree.branch.set_last_revision_info(revno_1, revid_1)
1242
1242
        self.tree.set_parent_ids([revid_1])
1243
1243
        # Make a new second commit, child-2.  child-2 has diverged from
1244
1244
        # child-1.
1245
 
        new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
 
1245
        new_r2 = self.tree.commit('2nd commit', rev_id=b'child-2')
1246
1246
        self.tree.unlock()
1247
1247
 
1248
1248
    def test_not_allow_diverged(self):
1580
1580
        write_token = tree.lock_write()
1581
1581
        self.addCleanup(tree.unlock)
1582
1582
        tree.add('')
1583
 
        tree.commit("Message", rev_id='rev1')
 
1583
        tree.commit("Message", rev_id=b'rev1')
1584
1584
        tree.branch.repository.start_write_group()
1585
1585
        write_group_tokens = tree.branch.repository.suspend_write_group()
1586
1586
        self.assertEqual(None, request.execute('', write_token,
1615
1615
        tree = self.make_branch_and_memory_tree('.')
1616
1616
        tree.lock_write()
1617
1617
        tree.add('')
1618
 
        tree.commit(rev_id='origineel', message="message")
1619
 
        tree.commit(rev_id='nog-een-revisie', message="message")
 
1618
        tree.commit(rev_id=b'origineel', message="message")
 
1619
        tree.commit(rev_id=b'nog-een-revisie', message="message")
1620
1620
        tree.unlock()
1621
1621
        self.assertEqual(
1622
1622
            smart_req.SuccessfulSmartServerResponse(("ok", ),
1899
1899
        request = smart_repo.SmartServerRepositoryIterFilesBytes(backing)
1900
1900
        t = self.make_branch_and_tree('.')
1901
1901
        self.addCleanup(t.lock_write().unlock)
1902
 
        self.build_tree_contents([("file", "somecontents")])
1903
 
        t.add(["file"], ["thefileid"])
1904
 
        t.commit(rev_id='somerev', message="add file")
 
1902
        self.build_tree_contents([("file", b"somecontents")])
 
1903
        t.add(["file"], [b"thefileid"])
 
1904
        t.commit(rev_id=b'somerev', message="add file")
1905
1905
        self.assertIs(None, request.execute(''))
1906
1906
        response = request.do_body("thefileid\0somerev\n")
1907
1907
        self.assertTrue(response.is_successful())
1944
1944
        tree = self.make_branch_and_memory_tree('.')
1945
1945
        tree.lock_write()
1946
1946
        tree.add('')
1947
 
        r1 = tree.commit('a commit', rev_id='A')
 
1947
        r1 = tree.commit('a commit', rev_id=b'A')
1948
1948
        tree.unlock()
1949
1949
        self.assertTrue(tree.branch.repository.has_revision('A'))
1950
1950
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
1959
1959
        tree = self.make_branch_and_memory_tree('.')
1960
1960
        tree.lock_write()
1961
1961
        tree.add('')
1962
 
        r1 = tree.commit('a commit', rev_id='A')
 
1962
        r1 = tree.commit('a commit', rev_id=b'A')
1963
1963
        tree.branch.repository.start_write_group()
1964
1964
        tree.branch.repository.sign_revision('A', strategy)
1965
1965
        tree.branch.repository.commit_write_group()
2066
2066
        request = smart_repo.SmartServerRepositoryGetRevisionSignatureText(
2067
2067
            backing)
2068
2068
        bb = self.make_branch_builder('.')
2069
 
        bb.build_commit(rev_id='A')
 
2069
        bb.build_commit(rev_id=b'A')
2070
2070
        repo = bb.get_branch().repository
2071
2071
        strategy = gpg.LoopbackGPGStrategy(None)
2072
2072
        self.addCleanup(repo.lock_write().unlock)
2671
2671
        request = smart_repo.SmartServerRepositoryGetInventories(backing)
2672
2672
        t = self.make_branch_and_tree('.', format='2a')
2673
2673
        self.addCleanup(t.lock_write().unlock)
2674
 
        self.build_tree_contents([("file", "somecontents")])
2675
 
        t.add(["file"], ["thefileid"])
2676
 
        t.commit(rev_id='somerev', message="add file")
 
2674
        self.build_tree_contents([("file", b"somecontents")])
 
2675
        t.add(["file"], [b"thefileid"])
 
2676
        t.commit(rev_id=b'somerev', message="add file")
2677
2677
        self.assertIs(None, request.execute('', 'unordered'))
2678
2678
        response = request.do_body("somerev\n")
2679
2679
        self.assertTrue(response.is_successful())
2692
2692
        request = smart_repo.SmartServerRepositoryGetInventories(backing)
2693
2693
        t = self.make_branch_and_tree('.', format='2a')
2694
2694
        self.addCleanup(t.lock_write().unlock)
2695
 
        self.build_tree_contents([("file", "somecontents")])
2696
 
        t.add(["file"], ["thefileid"])
2697
 
        t.commit(rev_id='somerev', message="add file")
 
2695
        self.build_tree_contents([("file", b"somecontents")])
 
2696
        t.add(["file"], [b"thefileid"])
 
2697
        t.commit(rev_id=b'somerev', message="add file")
2698
2698
        self.assertIs(None, request.execute('', 'unordered'))
2699
2699
        response = request.do_body("")
2700
2700
        self.assertTrue(response.is_successful())