← 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: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
17
17
"""Black box tests for the reconcile command."""
18
18
 
19
19
 
20
 
from bzrlib import (
21
 
    bzrdir,
22
 
    inventory,
23
 
    repository,
24
 
    tests,
25
 
    )
26
 
 
27
 
 
28
 
class TrivialTest(tests.TestCaseWithTransport):
 
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
29
41
 
30
42
    def test_trivial_reconcile(self):
31
43
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
48
60
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
49
61
        # an empty inventory with no revision will trigger reconciliation.
50
62
        repo = t.branch.repository
51
 
        inv = inventory.Inventory(revision_id='missing')
 
63
        inv = Inventory(revision_id='missing')
52
64
        inv.root.revision='missing'
53
65
        repo.lock_write()
54
66
        repo.start_write_group()