~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 05:35:00 UTC
  • mfrom: (4570 +trunk)
  • mto: (4634.6.29 2.0)
  • mto: This revision was merged to the branch mainline in revision 4680.
  • Revision ID: andrew.bennetts@canonical.com-20090727053500-q76zsn2dx33jhmj5
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
 
57
57
        self.assertEqual('', err)
58
58
        self.assertEqual('  2: Bar\n  1: Foo\n', out)
59
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
 
60
68
 
61
69
class TestShelveRelpath(TestCaseWithTransport):
62
70