← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf_tests.py

adjust tests for the 0.7 diff behavioural change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf_tests.py
37
37
        file('test_file', 'w').write(self.MODIFIED)
38
38
 
39
39
        # Check the diff is right
40
 
        self.assertEqual(self.capture('diff'),
 
40
        self.assertEqual(self.capture('diff', retcode=1),
41
41
            self.DIFF_HEADER + self.DIFF_1 + '\n')
42
42
 
43
43
        # Shelve the changes
57
57
        self.run_bzr('unshelve', retcode=True)
58
58
 
59
59
        # Check the diff is right again
60
 
        self.assertEqual(self.capture('diff'),
 
60
        self.assertEqual(self.capture('diff', retcode=1),
61
61
            self.DIFF_HEADER + self.DIFF_1 + '\n')
62
62
 
63
63
        # Make sure the file is back the way it should be
96
96
        self.run_bzr('shelve', '-r', '1', '--all', retcode=True)
97
97
 
98
98
        # Check the diff is right
99
 
        self.assertEqual(self.capture('diff'),
 
99
        self.assertEqual(self.capture('diff', retcode=1),
100
100
            self.DIFF_HEADER + self.DIFF_2 + '\n')
101
101
 
102
102
        # Make sure the file is the way it should be