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
17
17
"""Black box tests for the reconcile command."""
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
30
class TrivialTest(TestCaseWithTransport):
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()
39
def restoreDefaults(self):
40
ui.ui_factory = self.old_ui_factory
25
from bzrlib.tests.matchers import ContainsNoVfsCalls
28
class TrivialTest(tests.TestCaseWithTransport):
42
30
def test_trivial_reconcile(self):
43
t = bzrdir.BzrDir.create_standalone_workingtree('.')
31
t = controldir.ControlDir.create_standalone_workingtree('.')
44
32
(out, err) = self.run_bzr('reconcile')
45
33
if t.branch.repository._reconcile_backsup_inventory:
46
34
does_backup_text = "Inventory ok.\n"
57
45
self.assertEqualDiff(err, "")
59
47
def test_does_something_reconcile(self):
60
t = bzrdir.BzrDir.create_standalone_workingtree('.')
48
t = controldir.ControlDir.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'
66
54
repo.start_write_group()
85
73
self.assertEqualDiff(expected, out)
86
74
self.assertEqualDiff(err, "")
77
class TestSmartServerReconcile(tests.TestCaseWithTransport):
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)