/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: Breezy landing bot
  • Author(s): Gustav Hartvigsson
  • Date: 2021-01-10 18:46:30 UTC
  • mfrom: (7526.1.1 brz-removed-api-doc)
  • mto: This revision was merged to the branch mainline in revision 7532.
  • Revision ID: breezy.the.bot@gmail.com-20210110184630-dxu0g9dqq020uiw6
Drop documentation for removed API API.

Merged from https://code.launchpad.net/~gustav-hartvigsson/brz/removed-api-doc/+merge/396033

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_blackbox.py
175
175
            error,
176
176
            'Pushed up to revision id git(.*).\n')
177
177
 
 
178
    def test_merge(self):
 
179
        self.run_bzr(['init', '--git', 'orig'])
 
180
        self.build_tree_contents([('orig/a', 'orig contents\n')])
 
181
        self.run_bzr(['add', 'orig/a'])
 
182
        self.run_bzr(['commit', '-m', 'add orig', 'orig'])
 
183
        self.run_bzr(['clone', 'orig', 'other'])
 
184
        self.build_tree_contents([('other/a', 'new contents\n')])
 
185
        self.run_bzr(['commit', '-m', 'modify', 'other'])
 
186
        self.build_tree_contents([('orig/b', 'more\n')])
 
187
        self.run_bzr(['add', 'orig/b'])
 
188
        self.build_tree_contents([('orig/a', 'new contents\n')])
 
189
        self.run_bzr(['commit', '-m', 'more', 'orig'])
 
190
        self.run_bzr(['merge', '-d', 'orig', 'other'])
 
191
 
178
192
    def test_push_lossy_non_mainline(self):
179
193
        self.run_bzr(['init', '--git', 'bla'])
180
194
        self.run_bzr(['init', 'foo'])
347
361
        self.run_bzr(["git-import", "--colocated", "a", "b"])
348
362
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
349
363
        self.assertEqual(set(["abranch", "bbranch"]),
350
 
                         set(ControlDir.open("b").get_branches().keys()))
 
364
                         set(ControlDir.open("b").branch_names()))
351
365
 
352
366
    def test_git_import_incremental(self):
353
367
        r = GitRepo.init("a", mkdir=True)
359
373
        self.run_bzr(["git-import", "--colocated", "a", "b"])
360
374
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
361
375
        b = ControlDir.open("b")
362
 
        self.assertEqual(["abranch"], list(b.get_branches().keys()))
 
376
        self.assertEqual(["abranch"], b.branch_names())
363
377
 
364
378
    def test_git_import_tags(self):
365
379
        r = GitRepo.init("a", mkdir=True)
371
385
        self.run_bzr(["git-import", "--colocated", "a", "b"])
372
386
        self.assertEqual(set([".bzr"]), set(os.listdir("b")))
373
387
        b = ControlDir.open("b")
374
 
        self.assertEqual(["abranch"], list(b.get_branches().keys()))
 
388
        self.assertEqual(["abranch"], b.branch_names())
375
389
        self.assertEqual(["atag"],
376
390
                         list(b.open_branch("abranch").tags.get_tag_dict().keys()))
377
391
 
424
438
        self.assertEqual(out, '')
425
439
        self.assertTrue(err.endswith, '3 objects\n')
426
440
 
 
441
    def test_local_whoami(self):
 
442
        r = GitRepo.init("gitr", mkdir=True)
 
443
        self.build_tree_contents([('gitr/.git/config', """\
 
444
[user]
 
445
  email = some@example.com
 
446
  name = Test User
 
447
""")])
 
448
        out, err = self.run_bzr(["whoami", "-d", "gitr"])
 
449
        self.assertEqual(out, "Test User <some@example.com>\n")
 
450
        self.assertEqual(err, "")
 
451
 
 
452
        self.build_tree_contents([('gitr/.git/config', """\
 
453
[user]
 
454
  email = some@example.com
 
455
""")])
 
456
        out, err = self.run_bzr(["whoami", "-d", "gitr"])
 
457
        self.assertEqual(out, "some@example.com\n")
 
458
        self.assertEqual(err, "")
 
459
 
 
460
    def test_local_signing_key(self):
 
461
        r = GitRepo.init("gitr", mkdir=True)
 
462
        self.build_tree_contents([('gitr/.git/config', """\
 
463
[user]
 
464
  email = some@example.com
 
465
  name = Test User
 
466
  signingkey = D729A457
 
467
""")])
 
468
        out, err = self.run_bzr(["config", "-d", "gitr", "gpg_signing_key"])
 
469
        self.assertEqual(out, "D729A457\n")
 
470
        self.assertEqual(err, "")
 
471
 
427
472
 
428
473
class ShallowTests(ExternalBase):
429
474