/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: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 make_creator(self, tree):
 
30
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
 
31
        self.addCleanup(creator.finalize)
 
32
        return creator
 
33
 
 
34
    def test_shelve_one(self):
 
35
        tree = self.make_branch_and_tree('.')
 
36
        creator = self.make_creator(tree)
 
37
        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
 
38
        out, err = self.run_bzr('shelve --list', retcode=1)
 
39
        self.assertEqual('', err)
 
40
        self.assertEqual('  1: Foo\n', out)
 
41
 
 
42
    def test_shelve_no_message(self):
 
43
        tree = self.make_branch_and_tree('.')
 
44
        creator = self.make_creator(tree)
 
45
        shelf_id = tree.get_shelf_manager().shelve_changes(creator)
 
46
        out, err = self.run_bzr('shelve --list', retcode=1)
 
47
        self.assertEqual('', err)
 
48
        self.assertEqual('  1: <no message>\n', out)
 
49
 
 
50
    def test_shelf_order(self):
 
51
        tree = self.make_branch_and_tree('.')
 
52
        creator = self.make_creator(tree)
 
53
        tree.get_shelf_manager().shelve_changes(creator, 'Foo')
 
54
        creator = self.make_creator(tree)
 
55
        tree.get_shelf_manager().shelve_changes(creator, 'Bar')
 
56
        out, err = self.run_bzr('shelve --list', retcode=1)
 
57
        self.assertEqual('', err)
 
58
        self.assertEqual('  2: Bar\n  1: Foo\n', out)
 
59
 
 
60
    def test_shelve_destroy(self):
 
61
        tree = self.make_branch_and_tree('.')
 
62
        self.build_tree(['file'])
 
63
        tree.add('file')
 
64
        self.run_bzr('shelve --all --destroy')
 
65
        self.failIfExists('file')
 
66
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
 
67
 
 
68
 
 
69
class TestShelveRelpath(TestCaseWithTransport):
 
70
 
 
71
    def test_shelve_in_subdir(self):
 
72
        tree = self.make_branch_and_tree('tree')
 
73
        self.build_tree(['tree/file', 'tree/dir/'])
 
74
        tree.add('file')
 
75
        os.chdir('tree/dir')
 
76
        self.run_bzr('shelve --all ../file')