/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-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_blackbox.py
347
347
        self.run_bzr(["git-import", "--colocated", "a", "b"])
348
348
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
349
349
        self.assertEqual(set(["abranch", "bbranch"]),
350
 
                         set(ControlDir.open("b").get_branches().keys()))
 
350
                         set(ControlDir.open("b").branch_names()))
351
351
 
352
352
    def test_git_import_incremental(self):
353
353
        r = GitRepo.init("a", mkdir=True)
359
359
        self.run_bzr(["git-import", "--colocated", "a", "b"])
360
360
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
361
361
        b = ControlDir.open("b")
362
 
        self.assertEqual(["abranch"], list(b.get_branches().keys()))
 
362
        self.assertEqual(["abranch"], b.branch_names())
363
363
 
364
364
    def test_git_import_tags(self):
365
365
        r = GitRepo.init("a", mkdir=True)
371
371
        self.run_bzr(["git-import", "--colocated", "a", "b"])
372
372
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
373
373
        b = ControlDir.open("b")
374
 
        self.assertEqual(["abranch"], list(b.get_branches().keys()))
 
374
        self.assertEqual(["abranch"], b.branch_names())
375
375
        self.assertEqual(["atag"],
376
376
                         list(b.open_branch("abranch").tags.get_tag_dict().keys()))
377
377