/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/test_revisiontree.py

  • Committer: Vincent Ladeuil
  • Date: 2009-01-30 00:49:41 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090130004941-820fpd2ryyo127vv
Add more tests, fix pycurl double handling, revert previous tracking.

* bzrlib/tests/test_http.py:
(PredefinedRequestHandler): Renamed from
PreRecordedRequestHandler.
(PredefinedRequestHandler.handle_one_request): Get the canned
response from the test server directly.
(ActivityServerMixin): Make it a true object and intialize the
attributes in the constructor. Tests can now set the
canned_response attribute before querying the server.
(TestActivity.setUp, TestActivity.tearDown,
TestActivity.get_transport, TestActivity.assertActivitiesMatch):
Extracted from test_get to be able to write other tests.
(TestActivity.test_has, TestActivity.test_readv,
TestActivity.test_post): New tests, all cases should be covered
now.

* bzrlib/transport/http/response.py:
(RangeFile.__init__, RangeFile.read, handle_response): Revert
previous tracking, both http implementations can now report
activity from the socket.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
previous tracking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisiontree.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
# Authors:  Robert Collins <robert.collins@canonical.com>
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 
 
18
"""Tests for the RevisionTree class."""
 
19
 
 
20
from bzrlib import (
 
21
    revision,
 
22
    )
 
23
import bzrlib
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
 
 
26
 
 
27
class TestTreeWithCommits(TestCaseWithTransport):
 
28
 
 
29
    def setUp(self):
 
30
        super(TestTreeWithCommits, self).setUp()
 
31
        self.t = self.make_branch_and_tree('.')
 
32
        self.rev_id = self.t.commit('foo', allow_pointless=True)
 
33
        self.rev_tree = self.t.branch.repository.revision_tree(self.rev_id)
 
34
 
 
35
    def test_empty_no_unknowns(self):
 
36
        self.assertEqual([], list(self.rev_tree.unknowns()))
 
37
 
 
38
    def test_no_conflicts(self):
 
39
        self.assertEqual([], list(self.rev_tree.conflicts()))
 
40
 
 
41
    def test_parents(self):
 
42
        """RevisionTree.parent_ids should match the revision graph."""
 
43
        # XXX: TODO: Should this be a repository_implementation test ?
 
44
        # at the end of the graph, we get []
 
45
        self.assertEqual([], self.rev_tree.get_parent_ids())
 
46
        # do a commit to look further up
 
47
        revid_2 = self.t.commit('bar', allow_pointless=True)
 
48
        self.assertEqual(
 
49
            [self.rev_id],
 
50
            self.t.branch.repository.revision_tree(revid_2).get_parent_ids())
 
51
        # TODO commit a merge and check it is reported correctly.
 
52
 
 
53
        # the parents for a revision_tree(NULL_REVISION) are []:
 
54
        self.assertEqual([],
 
55
            self.t.branch.repository.revision_tree(
 
56
                revision.NULL_REVISION).get_parent_ids())
 
57
 
 
58
    def test_empty_no_root(self):
 
59
        null_tree = self.t.branch.repository.revision_tree(
 
60
            revision.NULL_REVISION)
 
61
        self.assertIs(None, null_tree.inventory.root)