/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/git/tests/test_blackbox.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 18:52:18 UTC
  • mto: (7490.7.7 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200322185218-4q1r1g0gof7ya53j
Fix reference handling.

Show diffs side-by-side

added added

removed removed

Lines of Context:
349
349
        self.run_bzr(["git-import", "--colocated", "a", "b"])
350
350
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
351
351
        self.assertEqual(set(["abranch", "bbranch"]),
352
 
                         set(ControlDir.open("b").get_branches().keys()))
 
352
                         set(ControlDir.open("b").branch_names()))
353
353
 
354
354
    def test_git_import_incremental(self):
355
355
        r = GitRepo.init("a", mkdir=True)
361
361
        self.run_bzr(["git-import", "--colocated", "a", "b"])
362
362
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
363
363
        b = ControlDir.open("b")
364
 
        self.assertEqual(["abranch"], list(b.get_branches().keys()))
 
364
        self.assertEqual(["abranch"], b.branch_names())
365
365
 
366
366
    def test_git_import_tags(self):
367
367
        r = GitRepo.init("a", mkdir=True)
373
373
        self.run_bzr(["git-import", "--colocated", "a", "b"])
374
374
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
375
375
        b = ControlDir.open("b")
376
 
        self.assertEqual(["abranch"], list(b.get_branches().keys()))
 
376
        self.assertEqual(["abranch"], b.get_branches().branch_names())
377
377
        self.assertEqual(["atag"],
378
378
                         list(b.open_branch("abranch").tags.get_tag_dict().keys()))
379
379