← 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-01-25 17:48:22 UTC
  • mto: (4987.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125174822-nce4l19sbwx83jvq
Deploying the new overrideAttr facility further reduces the complexity
and make the code clearer.

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
 
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
 
        # XXX: Dead code below -- vila 100123
35
 
        self.old_format = bzrdir.BzrDirFormat.get_default_format()
36
 
        self.addAttrCleanup(ui, 'ui_factory')
37
 
        ui.ui_factory = TestUIFactory()
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    inventory,
 
23
    repository,
 
24
    tests,
 
25
    )
 
26
 
 
27
 
 
28
class TrivialTest(tests.TestCaseWithTransport):
38
29
 
39
30
    def test_trivial_reconcile(self):
40
31
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
57
48
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
58
49
        # an empty inventory with no revision will trigger reconciliation.
59
50
        repo = t.branch.repository
60
 
        inv = Inventory(revision_id='missing')
 
51
        inv = inventory.Inventory(revision_id='missing')
61
52
        inv.root.revision='missing'
62
53
        repo.lock_write()
63
54
        repo.start_write_group()