← 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: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

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
    tests,
 
24
    )
 
25
from bzrlib.tests.matchers import ContainsNoVfsCalls
 
26
 
 
27
 
 
28
class TrivialTest(tests.TestCaseWithTransport):
41
29
 
42
30
    def test_trivial_reconcile(self):
43
31
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
44
 
        (out, err) = self.run_bzr_captured(['reconcile'])
45
 
        self.assertEqualDiff(out, "Reconciling repository %s\n"
46
 
                                  "Inventory ok.\n"
 
32
        (out, err) = self.run_bzr('reconcile')
 
33
        if t.branch.repository._reconcile_backsup_inventory:
 
34
            does_backup_text = "Inventory ok.\n"
 
35
        else:
 
36
            does_backup_text = ""
 
37
        self.assertEqualDiff(out, "Reconciling branch %s\n"
 
38
                                  "revision_history ok.\n"
 
39
                                  "Reconciling repository %s\n"
 
40
                                  "%s"
47
41
                                  "Reconciliation complete.\n" %
48
 
                                  t.bzrdir.root_transport.base)
 
42
                                  (t.branch.base,
 
43
                                   t.bzrdir.root_transport.base,
 
44
                                   does_backup_text))
49
45
        self.assertEqualDiff(err, "")
50
46
 
51
47
    def test_does_something_reconcile(self):
52
48
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
53
49
        # an empty inventory with no revision will trigger reconciliation.
54
50
        repo = t.branch.repository
55
 
        inv = Inventory(revision_id='missing')
 
51
        inv = inventory.Inventory(revision_id='missing')
56
52
        inv.root.revision='missing'
 
53
        repo.lock_write()
 
54
        repo.start_write_group()
57
55
        repo.add_inventory('missing', inv, [])
58
 
        (out, err) = self.run_bzr_captured(['reconcile'])
59
 
        self.assertEqualDiff(out, "Reconciling repository %s\n"
60
 
                                  "Backup Inventory created.\n"
61
 
                                  "Inventory regenerated.\n"
62
 
                                  "Reconciliation complete.\n" %
63
 
                                  t.bzrdir.root_transport.base)
 
56
        repo.commit_write_group()
 
57
        repo.unlock()
 
58
        (out, err) = self.run_bzr('reconcile')
 
59
        if repo._reconcile_backsup_inventory:
 
60
            does_backup_text = (
 
61
                "Backup Inventory created.\n"
 
62
                "Inventory regenerated.\n")
 
63
        else:
 
64
            does_backup_text = ""
 
65
        expected = ("Reconciling branch %s\n"
 
66
                    "revision_history ok.\n"
 
67
                    "Reconciling repository %s\n"
 
68
                    "%s"
 
69
                    "Reconciliation complete.\n" %
 
70
                    (t.branch.base,
 
71
                     t.bzrdir.root_transport.base,
 
72
                     does_backup_text))
 
73
        self.assertEqualDiff(expected, out)
64
74
        self.assertEqualDiff(err, "")
 
75
 
 
76
 
 
77
class TestSmartServerReconcile(tests.TestCaseWithTransport):
 
78
 
 
79
    def test_simple_reconcile(self):
 
80
        self.setup_smart_server_with_call_log()
 
81
        self.make_branch('branch')
 
82
        self.reset_smart_call_log()
 
83
        out, err = self.run_bzr(['reconcile', self.get_url('branch')])
 
84
        # This figure represent the amount of work to perform this use case. It
 
85
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
86
        # being too low. If rpc_count increases, more network roundtrips have
 
87
        # become necessary for this use case. Please do not adjust this number
 
88
        # upwards without agreement from bzr's network support maintainers.
 
89
        self.assertLength(10, self.hpss_calls)
 
90
        self.assertLength(1, self.hpss_connections)
 
91
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)