← 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
16
16
    DIFF_1 = """--- %(filename)s\t%(old_date)s
17
17
+++ %(filename)s\t%(new_date)s
18
18
@@ -1,4 +1,4 @@
19
 
 
20
 
 
 
19
 
 
20
 
21
21
-hello test world
22
22
+goodbye test world
23
 
 
 
23
 
24
24
"""
25
25
    DIFF_2 = """--- test_file\t%(old_date)s
26
26
+++ test_file\t%(new_date)s
27
27
@@ -1,4 +1,4 @@
28
 
 
29
 
 
 
28
 
 
29
 
30
30
-goodbye test world
31
31
+hello test world
32
 
 
 
32
 
33
33
"""
34
34
    def _check_diff(self, diff=DIFF_1, filename='test_file'):
35
35
        old_tree = self.tree.basis_tree()
44
44
        finally:
45
45
            self.tree.unlock()
46
46
            old_tree.unlock()
47
 
        keys = { 'filename' : filename , 'old_date': old_date, 
 
47
        keys = { 'filename' : filename , 'old_date': old_date,
48
48
                 'new_date': new_date}
49
49
        hdr  = self.DIFF_HEADER % keys
50
50
        diff = diff % keys
612
612
        f = file('test_file', 'wb')
613
613
        f.write(self.MODIFIED)
614
614
        f.close()
615
 
        stdout, error = self.run_bzr_captured(['shelve', '--all', 
 
615
        stdout, error = self.run_bzr_captured(['shelve', '--all',
616
616
                                               '--no-color'])
617
 
        stdout, error = self.run_bzr_captured(['unshelve', '--all', 
 
617
        stdout, error = self.run_bzr_captured(['unshelve', '--all',
618
618
                                               '--no-color'])