/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_shelve.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/blackbox/test_shelve.py
 
1
# Copyright (C) 2008 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
import os
 
18
 
 
19
from bzrlib import shelf
 
20
from bzrlib.tests import TestCaseWithTransport
 
21
 
 
22
class TestShelveList(TestCaseWithTransport):
 
23
 
 
24
    def test_no_shelved_changes(self):
 
25
        tree = self.make_branch_and_tree('.')
 
26
        err = self.run_bzr('shelve --list')[1]
 
27
        self.assertEqual('No shelved changes.\n', err)
 
28
 
 
29
    def test_shelve_one(self):
 
30
        tree = self.make_branch_and_tree('.')
 
31
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
 
32
        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
 
33
        out, err = self.run_bzr('shelve --list', retcode=1)
 
34
        self.assertEqual('', err)
 
35
        self.assertEqual('  1: Foo\n', out)
 
36
 
 
37
    def test_shelve_no_message(self):
 
38
        tree = self.make_branch_and_tree('.')
 
39
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
 
40
        shelf_id = tree.get_shelf_manager().shelve_changes(creator)
 
41
        out, err = self.run_bzr('shelve --list', retcode=1)
 
42
        self.assertEqual('', err)
 
43
        self.assertEqual('  1: <no message>\n', out)
 
44
 
 
45
    def test_shelf_order(self):
 
46
        tree = self.make_branch_and_tree('.')
 
47
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
 
48
        tree.get_shelf_manager().shelve_changes(creator, 'Foo')
 
49
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
 
50
        tree.get_shelf_manager().shelve_changes(creator, 'Bar')
 
51
        out, err = self.run_bzr('shelve --list', retcode=1)
 
52
        self.assertEqual('', err)
 
53
        self.assertEqual('  2: Bar\n  1: Foo\n', out)
 
54
 
 
55
 
 
56
class TestShelveRelpath(TestCaseWithTransport):
 
57
 
 
58
    def test_shelve_in_subdir(self):
 
59
        tree = self.make_branch_and_tree('tree')
 
60
        self.build_tree(['tree/file', 'tree/dir/'])
 
61
        tree.add('file')
 
62
        os.chdir('tree/dir')
 
63
        self.run_bzr('shelve --all ../file')