← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests.py

  • Committer: Michael Ellerman
  • Date: 2005-11-29 01:41:52 UTC
  • mto: (0.3.1 shelf-dev) (325.1.2 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 334.
  • Revision ID: michael@ellerman.id.au-20051129014152-f5ede8888bcebc48
HunkSelector was broken if you did a "done" followed by "status/invert" etc.
Fixup to make pychecker happy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests.py
50
50
                self.DIFF_HEADER + self.DIFF_1 + '\n')
51
51
 
52
52
            # Shelve the changes
53
 
            self.run_bzr('shelve', retcode=0)
 
53
            self.run_bzr('shelve', retcode=True)
54
54
 
55
55
            # Make sure there is no diff anymore
56
56
            self.assertEqual(self.capture('diff', retcode=0), '')
59
59
            self.assertEqual(file('test_file').read(), self.ORIGINAL)
60
60
 
61
61
            # Check the shelf is right
62
 
            shelf = b._transport.get('.shelf/default/00').read()
 
62
            shelf = b._transport.get('.bzr/x-shelf/default/00').read()
63
63
            self.assertEqual(shelf, self.DIFF_1)
64
64
 
65
65
            # Unshelve
66
 
            self.run_bzr('unshelve', retcode=0)
 
66
            self.run_bzr('unshelve', retcode=True)
67
67
 
68
68
            # Check the diff is right again
69
69
            self.assertEqual(self.capture('diff', retcode=1),
83
83
        b.working_tree().commit(message='add test_file')
84
84
 
85
85
        # Shelve the changes
86
 
        self.run_bzr('shelve', retcode=3)
 
86
        self.run_bzr('shelve', retcode=True)
87
87
 
88
 
        if b._transport.has('.shelf/default/00'):
 
88
        if b._transport.has('.bzr/x-shelf/default/00'):
89
89
            self.fail("Shelf exists, but it shouldn't")
90
90
 
91
91
    def test_shelf_with_revision(self):
102
102
        b.working_tree().commit(message='update test_file')
103
103
 
104
104
        # Shelve the changes
105
 
        self.run_bzr('shelve', '-r', '1', retcode=0)
 
105
        self.run_bzr('shelve', '-r', '1', retcode=True)
106
106
 
107
107
        # Check the diff is right
108
108
        self.assertEqual(self.capture('diff', retcode=1),
112
112
        self.assertEqual(file('test_file').read(), self.ORIGINAL)
113
113
 
114
114
        # Unshelve
115
 
        self.run_bzr('unshelve', retcode=0)
 
115
        self.run_bzr('unshelve', retcode=True)
116
116
 
117
117
        # Make sure the file is back the way it should be
118
118
        self.assertEqual(file('test_file').read(), self.MODIFIED)
125
125
        (stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
126
126
 
127
127
        self.assertEqual(stderr.split('\n')[0],
128
 
            'bzr: ERROR: shelve only accepts a single revision parameter.')
129
 
 
130
 
    def test_shelf_long_filename(self):
131
 
        """Regression test for diffstat with long filenames.
132
 
 
133
 
        Create a branch with two files, one of which has a long name. Commit.
134
 
        Modify both files. Shelve the file with the short name. If diffstat
135
 
        has regressed, it will generate a diffstat of the file with the long
136
 
        name, and break.
137
 
        """
138
 
        self.run_bzr('init')
139
 
        filename = 'a' * 80
140
 
        file(filename, 'wb').write('hello')
141
 
        file('foo', 'wb').write('bar')
142
 
        self.run_bzr('add')
143
 
        self.run_bzr('commit', '-m', 'added')
144
 
        file(filename, 'wb').write('goodbye')
145
 
        file('foo', 'wb').write('baz')
146
 
        self.run_bzr('shelve', 'foo', retcode=0)
147
 
 
 
128
            'bzr: ERROR: bzrlib.errors.BzrCommandError: shelve only ' \
 
129
                'accepts a single revision parameter.')