← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2010-02-25 04:15:25 UTC
  • mfrom: (730.1.5 2.0)
  • Revision ID: aaron@aaronbentley.com-20100225041525-41kwgjtklpflxhbw
Merged 2.0 into 2.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
7
7
    UnshelveHunkSelector,
8
8
    )
9
9
from bzrlib.plugins.bzrtools.errors import NoColor
 
10
from bzrlib.plugins.bzrtools import command
10
11
from bzrlib.plugins.bzrtools.command_classes import cmd_shelf1
11
12
 
12
13
 
32
33
+hello test world
33
34
 
34
35
"""
 
36
    def setUp(self):
 
37
        bzrlib.tests.TestCaseWithTransport.setUp(self)
 
38
        command._testing = True
 
39
        self.addCleanup(command._stop_testing)
 
40
 
35
41
    def _check_diff(self, diff=DIFF_1, filename='test_file'):
36
42
        old_tree = self.tree.basis_tree()
37
43
        old_tree.lock_read()