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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-02 11:26:27 UTC
  • mfrom: (6621.27.5 1089352-sni-support)
  • Revision ID: breezy.the.bot@gmail.com-20170602112627-jbvjcm9czx7gt3gb
Add SNI support.

Merged from https://code.launchpad.net/~jelmer/brz/sni-support/+merge/324979

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_reconcile.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2008-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
19
19
 
20
 
from bzrlib import bzrdir, errors, tests
21
 
from bzrlib.reconcile import reconcile, Reconciler
22
 
from bzrlib.revision import Revision
23
 
from bzrlib.tests.per_repository import TestCaseWithRepository
24
 
from bzrlib.transport import get_transport
25
 
from bzrlib.workingtree import WorkingTree
26
 
 
27
 
 
28
 
class TestWorksWithSharedRepositories(TestCaseWithRepository):
 
20
from breezy import (
 
21
    bzrdir,
 
22
    errors,
 
23
    tests,
 
24
    )
 
25
from breezy.reconcile import reconcile, Reconciler
 
26
from breezy.tests import per_repository
 
27
 
 
28
 
 
29
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
29
30
 
30
31
    def test_reweave_empty(self):
31
32
        # we want a repo capable format