← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Charlie Shepherd
  • Date: 2007-04-04 18:12:00 UTC
  • mto: This revision was merged to the branch mainline in revision 538.
  • Revision ID: masterdriverz@gentoo.org-20070404181200-wqiwytdor9srux2v
Remove all trailing whitespace

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 cmd_shelf
11
10
 
12
11
 
13
12
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
17
16
    DIFF_1 = """--- %(filename)s\t%(old_date)s
18
17
+++ %(filename)s\t%(new_date)s
19
18
@@ -1,4 +1,4 @@
20
 
 
21
 
 
 
19
 
 
20
 
22
21
-hello test world
23
22
+goodbye test world
24
 
 
 
23
 
25
24
"""
26
25
    DIFF_2 = """--- test_file\t%(old_date)s
27
26
+++ test_file\t%(new_date)s
28
27
@@ -1,4 +1,4 @@
29
 
 
30
 
 
 
28
 
 
29
 
31
30
-goodbye test world
32
31
+hello test world
33
 
 
 
32
 
34
33
"""
35
34
    def _check_diff(self, diff=DIFF_1, filename='test_file'):
36
35
        old_tree = self.tree.basis_tree()
617
616
                                               '--no-color'])
618
617
        stdout, error = self.run_bzr_captured(['unshelve', '--all',
619
618
                                               '--no-color'])
620
 
 
621
 
    def test_shelf_help(self):
622
 
        self.assertContainsRe(cmd_shelf().help(),
623
 
                              'list\n.*List the patches on the current shelf')