← 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-03-26 16:26:09 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070326162609-7ale5l110bjkfa0g
Add branch parameter to show-paths

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
76
76
    def __test_loop(self, count):
77
77
        self.tree = self.make_branch_and_tree('.')
78
78
        self.__create_and_add_test_file()
79
 
        for counter in range(count):
80
 
            # Modify the test file
81
 
            # write in binary mode because on win32 line-endings should be
82
 
            # LF
83
 
            f = file('test_file', 'wb')
84
 
            f.write(self.MODIFIED)
85
 
            f.close()
86
 
 
87
 
            self._check_diff()
88
 
 
89
 
            self.tree.lock_write()
90
 
            try:
 
79
        self.tree.lock_write()
 
80
        try:
 
81
            while count > 0:
 
82
                count -= 1
 
83
 
 
84
                # Modify the test file
 
85
                # write in binary mode because on win32 line-endings should be
 
86
                # LF
 
87
                f = file('test_file', 'wb')
 
88
                f.write(self.MODIFIED)
 
89
                f.close()
 
90
 
 
91
                self._check_diff()
 
92
 
91
93
                new_date = _patch_header_date(self.tree,
92
94
                    self.tree.inventory.path2id('test_file'), 'test_file')
93
 
            finally:
94
 
                self.tree.unlock()
95
 
 
96
 
            # Shelve the changes
97
 
            self.run_bzr('shelve', '--all', retcode=0)
98
 
 
99
 
            # Make sure there is no diff anymore
100
 
            self.assertEqual(self.capture('diff', retcode=0), '')
101
 
 
102
 
            # Make sure the file is actually back the way it was
103
 
            self.assertEqual(file('test_file').read(), self.ORIGINAL)
104
 
 
105
 
            self._check_shelf('00', new_date=new_date)
106
 
 
107
 
            # Unshelve
108
 
            self.run_bzr('unshelve', '--all', retcode=0)
109
 
 
110
 
            self._check_diff()
111
 
 
112
 
            # Check the shelved patch was backed up
113
 
            self._check_shelf('00~', new_date=new_date)
114
 
 
115
 
            # Make sure the file is back the way it should be
116
 
            self.assertEqual(file('test_file').read(), self.MODIFIED)
 
95
 
 
96
                # Shelve the changes
 
97
                self.run_bzr('shelve', '--all', retcode=0)
 
98
 
 
99
                # Make sure there is no diff anymore
 
100
                self.assertEqual(self.capture('diff', retcode=0), '')
 
101
 
 
102
                # Make sure the file is actually back the way it was
 
103
                self.assertEqual(file('test_file').read(), self.ORIGINAL)
 
104
 
 
105
                self._check_shelf('00', new_date=new_date)
 
106
 
 
107
                # Unshelve
 
108
                self.run_bzr('unshelve', '--all', retcode=0)
 
109
 
 
110
                self._check_diff()
 
111
 
 
112
                # Check the shelved patch was backed up
 
113
                self._check_shelf('00~', new_date=new_date)
 
114
 
 
115
                # Make sure the file is back the way it should be
 
116
                self.assertEqual(file('test_file').read(), self.MODIFIED)
 
117
        finally:
 
118
            self.tree.unlock()
117
119
 
118
120
    def test_shelf_nothing_to_shelve(self):
119
121
        import os.path
612
614
        f = file('test_file', 'wb')
613
615
        f.write(self.MODIFIED)
614
616
        f.close()
615
 
        stdout, error = self.run_bzr_captured(['shelve', '--all',
 
617
        stdout, error = self.run_bzr_captured(['shelve', '--all', 
616
618
                                               '--no-color'])
617
 
        stdout, error = self.run_bzr_captured(['unshelve', '--all',
 
619
        stdout, error = self.run_bzr_captured(['unshelve', '--all', 
618
620
                                               '--no-color'])