← 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-16 17:59:43 UTC
  • mfrom: (524 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 530.
  • Revision ID: abentley@panoramicfeedback.com-20070316175943-t6lh5aaesomyng85
Merge fixes from bzrtools-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
42
42
            new_date = _patch_header_date(self.tree,
43
43
                self.tree.inventory.path2id(filename), filename)
44
44
        finally:
 
45
            self.tree.unlock()
45
46
            old_tree.unlock()
46
47
        keys = { 'filename' : filename , 'old_date': old_date, 
47
48
                 'new_date': new_date}
75
76
    def __test_loop(self, count):
76
77
        self.tree = self.make_branch_and_tree('.')
77
78
        self.__create_and_add_test_file()
78
 
 
79
 
        while count > 0:
80
 
            count -= 1
81
 
 
82
 
            # Modify the test file
83
 
            # write in binary mode because on win32 line-endings should be LF
84
 
            f = file('test_file', 'wb')
85
 
            f.write(self.MODIFIED)
86
 
            f.close()
87
 
 
88
 
            self._check_diff()
89
 
            
90
 
            new_date = _patch_header_date(self.tree, 
91
 
                self.tree.inventory.path2id('test_file'), 'test_file')
92
 
 
93
 
            # Shelve the changes
94
 
            self.run_bzr('shelve', '--all', retcode=0)
95
 
 
96
 
            # Make sure there is no diff anymore
97
 
            self.assertEqual(self.capture('diff', retcode=0), '')
98
 
 
99
 
            # Make sure the file is actually back the way it was
100
 
            self.assertEqual(file('test_file').read(), self.ORIGINAL)
101
 
 
102
 
            self._check_shelf('00', new_date=new_date)
103
 
 
104
 
            # Unshelve
105
 
            self.run_bzr('unshelve', '--all', retcode=0)
106
 
 
107
 
            self._check_diff()
108
 
 
109
 
            # Check the shelved patch was backed up
110
 
            self._check_shelf('00~', new_date=new_date)
111
 
 
112
 
            # Make sure the file is back the way it should be
113
 
            self.assertEqual(file('test_file').read(), self.MODIFIED)
 
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
 
 
93
                new_date = _patch_header_date(self.tree,
 
94
                    self.tree.inventory.path2id('test_file'), 'test_file')
 
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()
114
119
 
115
120
    def test_shelf_nothing_to_shelve(self):
116
121
        import os.path