/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Better (but still incomplete) design for bogus servers.

* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractHTTPHandler): Add 'Accept: */*' again to default headers
until I fully understand why and when it's needed or not (curl add
it if no Accept header is present).

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): CURLE_GOT_NOTHING may be
considered as a ConnectionError, inspection of curl code reveals
that the case is sufficiently rare and low level related to not be
considered an http error per se.

* bzrlib/transport/http/__init__.py:
(WallHttpServer): Deleted.

* bzrlib/tests/test_http.py:
(TestBogusServer): Factor out the tests common to the bogus
servers.

* bzrlib/tests/__init__.py:
(TestCaseWithTransport.create_transport_server,
TestCaseWithTransport.create_transport_readonly_server): New
methods, allows test cases to specify the transport servers
without defining useless classes.
(TestCaseWithTransport.get_readonly_server): Use
create_transport_readonly_server.
(TestCaseWithTransport.get_server): Use create_transport_server.

* bzrlib/tests/HTTPTestUtil.py:
(TestCaseWithWebserver): Fix typo in doc string.
(TestCaseWithWallserver): Deleted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconcile.py
 
1
# Copyright (C) 2006 by Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
"""Black box tests for the reconcile command."""
 
18
 
 
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.blackbox 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
 
41
 
 
42
    def test_trivial_reconcile(self):
 
43
        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"
 
47
                                  "Reconciliation complete.\n" %
 
48
                                  t.bzrdir.root_transport.base)
 
49
        self.assertEqualDiff(err, "")
 
50
 
 
51
    def test_does_something_reconcile(self):
 
52
        t = bzrdir.BzrDir.create_standalone_workingtree('.')
 
53
        # an empty inventory with no revision will trigger reconciliation.
 
54
        repo = t.branch.repository
 
55
        inv = Inventory(revision_id='missing')
 
56
        inv.root.revision='missing'
 
57
        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)
 
64
        self.assertEqualDiff(err, "")