← 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: 2007-06-12 22:09:44 UTC
  • mfrom: (540.1.2 bzrtools-0.17)
  • Revision ID: aaron.bentley@utoronto.ca-20070612220944-5zw4hlzp1ctq6mkl
Merge fixes from 0.17

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
17
17
    DIFF_1 = """--- %(filename)s\t%(old_date)s
18
18
+++ %(filename)s\t%(new_date)s
19
19
@@ -1,4 +1,4 @@
20
 
 
21
 
 
 
20
 
 
21
 
22
22
-hello test world
23
23
+goodbye test world
24
 
 
 
24
 
25
25
"""
26
26
    DIFF_2 = """--- test_file\t%(old_date)s
27
27
+++ test_file\t%(new_date)s
28
28
@@ -1,4 +1,4 @@
29
 
 
30
 
 
 
29
 
 
30
 
31
31
-goodbye test world
32
32
+hello test world
33
 
 
 
33
 
34
34
"""
35
35
    def _check_diff(self, diff=DIFF_1, filename='test_file'):
36
36
        old_tree = self.tree.basis_tree()