← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2007-06-28 12:26:11 UTC
  • mto: (2581.1.1 cleanup-runbzr)
  • mto: This revision was merged to the branch mainline in revision 2588.
  • Revision ID: v.ladeuil+lp@free.fr-20070628122611-0suhzl7o6aep1ibz
Revert the intrusive run_bzr('commit') rewritings.

* bzrlib/tests/test_smart_add.py:
(TestSmartAdd.test_add_dry_run,
TestSmartAdd.test_returns_and_ignores):  Delete useless import.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_shelve.py
1
 
# Copyright (C) 2008, 2009 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
 
from bzrlib.tests.script import ScriptRunner
22
 
 
23
 
 
24
 
class TestShelveList(TestCaseWithTransport):
25
 
 
26
 
    def test_no_shelved_changes(self):
27
 
        tree = self.make_branch_and_tree('.')
28
 
        err = self.run_bzr('shelve --list')[1]
29
 
        self.assertEqual('No shelved changes.\n', err)
30
 
 
31
 
    def make_creator(self, tree):
32
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree(), [])
33
 
        self.addCleanup(creator.finalize)
34
 
        return creator
35
 
 
36
 
    def test_shelve_one(self):
37
 
        tree = self.make_branch_and_tree('.')
38
 
        creator = self.make_creator(tree)
39
 
        shelf_id = tree.get_shelf_manager().shelve_changes(creator, 'Foo')
40
 
        out, err = self.run_bzr('shelve --list', retcode=1)
41
 
        self.assertEqual('', err)
42
 
        self.assertEqual('  1: Foo\n', out)
43
 
 
44
 
    def test_shelve_no_message(self):
45
 
        tree = self.make_branch_and_tree('.')
46
 
        creator = self.make_creator(tree)
47
 
        shelf_id = tree.get_shelf_manager().shelve_changes(creator)
48
 
        out, err = self.run_bzr('shelve --list', retcode=1)
49
 
        self.assertEqual('', err)
50
 
        self.assertEqual('  1: <no message>\n', out)
51
 
 
52
 
    def test_shelf_order(self):
53
 
        tree = self.make_branch_and_tree('.')
54
 
        creator = self.make_creator(tree)
55
 
        tree.get_shelf_manager().shelve_changes(creator, 'Foo')
56
 
        creator = self.make_creator(tree)
57
 
        tree.get_shelf_manager().shelve_changes(creator, 'Bar')
58
 
        out, err = self.run_bzr('shelve --list', retcode=1)
59
 
        self.assertEqual('', err)
60
 
        self.assertEqual('  2: Bar\n  1: Foo\n', out)
61
 
 
62
 
    def test_shelve_destroy(self):
63
 
        tree = self.make_branch_and_tree('.')
64
 
        self.build_tree(['file'])
65
 
        tree.add('file')
66
 
        self.run_bzr('shelve --all --destroy')
67
 
        self.failIfExists('file')
68
 
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
69
 
 
70
 
    def test_unshelve_keep(self):
71
 
        # https://bugs.edge.launchpad.net/bzr/+bug/492091
72
 
        tree = self.make_branch_and_tree('.')
73
 
        # shelve apparently unhappy working with a tree with no root yet
74
 
        tree.commit('make root')
75
 
        self.build_tree(['file'])
76
 
 
77
 
        sr = ScriptRunner()
78
 
        sr.run_script(self, '''
79
 
$ bzr add file
80
 
$ bzr shelve --all -m Foo
81
 
$ bzr shelve --list
82
 
  1: Foo
83
 
$ bzr unshelve --keep
84
 
$ bzr shelve --list
85
 
  1: Foo
86
 
$ cat file
87
 
contents of file
88
 
''')
89
 
 
90
 
 
91
 
 
92
 
class TestShelveRelpath(TestCaseWithTransport):
93
 
 
94
 
    def test_shelve_in_subdir(self):
95
 
        tree = self.make_branch_and_tree('tree')
96
 
        self.build_tree(['tree/file', 'tree/dir/'])
97
 
        tree.add('file')
98
 
        os.chdir('tree/dir')
99
 
        self.run_bzr('shelve --all ../file')