← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconcile.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Black box tests for the reconcile command."""
18
18
 
19
19
 
20
 
import bzrlib
21
 
import bzrlib.bzrdir as bzrdir
22
 
from bzrlib.inventory import Inventory
23
 
import bzrlib.repository as repository
24
 
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tests import TestUIFactory
26
 
from bzrlib.transport import get_transport
27
 
import bzrlib.ui as ui
28
 
 
29
 
 
30
 
class TrivialTest(TestCaseWithTransport):
31
 
 
32
 
    def setUp(self):
33
 
        super(TrivialTest, self).setUp()
34
 
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
35
 
        self.old_ui_factory = ui.ui_factory
36
 
        self.addCleanup(self.restoreDefaults)
37
 
        ui.ui_factory = TestUIFactory()
38
 
 
39
 
    def restoreDefaults(self):
40
 
        ui.ui_factory = self.old_ui_factory
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    inventory,
 
23
    repository,
 
24
    tests,
 
25
    )
 
26
 
 
27
 
 
28
class TrivialTest(tests.TestCaseWithTransport):
41
29
 
42
30
    def test_trivial_reconcile(self):
43
31
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
60
48
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
61
49
        # an empty inventory with no revision will trigger reconciliation.
62
50
        repo = t.branch.repository
63
 
        inv = Inventory(revision_id='missing')
 
51
        inv = inventory.Inventory(revision_id='missing')
64
52
        inv.root.revision='missing'
65
53
        repo.lock_write()
66
54
        repo.start_write_group()