/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_upstream_import.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 19:18:40 UTC
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218191840-2wezg20u9ffbfmed
Fix more bees, use with rather than try/finally for some files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upstream_import.py
142
142
            os.mkdir(prefix + 'junk')
143
143
            archive_file.add(prefix + 'junk')
144
144
 
145
 
            f = file(prefix + 'README', 'wb')
146
 
            f.write('Now?')
147
 
            f.close()
 
145
            with file(prefix + 'README', 'wb') as f:
 
146
                f.write('Now?')
148
147
            archive_file.add(prefix + 'README')
149
148
 
150
 
            f = file(prefix + 'README', 'wb')
151
 
            f.write('Wow?')
152
 
            f.close()
 
149
            with file(prefix + 'README', 'wb') as f:
 
150
                f.write('Wow?')
153
151
            # Add a second entry for README with different contents.
154
152
            archive_file.add(prefix + 'README')
155
153
            archive_file.close()
162
160
 
163
161
    def make_messed_tar(self):
164
162
        result = StringIO()
165
 
        tar_file = tarfile.open('project-0.1.tar', 'w', result)
166
 
        os.mkdir('project-0.1')
167
 
        tar_file.add('project-0.1')
168
 
 
169
 
        os.mkdir('project-0.2')
170
 
        tar_file.add('project-0.2')
171
 
 
172
 
        f = file('project-0.1/README', 'wb')
173
 
        f.write('What?')
174
 
        f.close()
175
 
        tar_file.add('project-0.1/README')
176
 
        tar_file.close()
 
163
        with tarfile.open('project-0.1.tar', 'w', result) as tar_file:
 
164
            os.mkdir('project-0.1')
 
165
            tar_file.add('project-0.1')
 
166
 
 
167
            os.mkdir('project-0.2')
 
168
            tar_file.add('project-0.2')
 
169
 
 
170
            with file('project-0.1/README', 'wb') as f:
 
171
                f.write('What?')
 
172
            tar_file.add('project-0.1/README')
177
173
        rmtree('project-0.1')
178
174
        result.seek(0)
179
175
        return result
185
181
 
186
182
    def make_tar_with_bzrdir(self):
187
183
        result = StringIO()
188
 
        tar_file = tarfile.open('tar-with-bzrdir.tar', 'w', result)
189
 
        os.mkdir('toplevel-dir')
190
 
        tar_file.add('toplevel-dir')
191
 
        os.mkdir('toplevel-dir/.bzr')
192
 
        tar_file.add('toplevel-dir/.bzr')
193
 
        tar_file.close()
 
184
        with tarfile.open('tar-with-bzrdir.tar', 'w', result) as tar_file:
 
185
            os.mkdir('toplevel-dir')
 
186
            tar_file.add('toplevel-dir')
 
187
            os.mkdir('toplevel-dir/.bzr')
 
188
            tar_file.add('toplevel-dir/.bzr')
194
189
        rmtree('toplevel-dir')
195
190
        result.seek(0)
196
191
        return result
238
233
            self.assertTrue(os.path.isfile(tree.abspath('README')))
239
234
            self.assertEqual(tree.stored_kind('README'), 'file')
240
235
            self.assertEqual(tree.stored_kind('FEEDME'), 'file')
241
 
            f = file(tree.abspath('junk/food'), 'wb')
242
 
            f.write('I like food\n')
243
 
            f.close()
 
236
            with file(tree.abspath('junk/food'), 'wb') as f:
 
237
                f.write('I like food\n')
244
238
 
245
239
            with warnings.catch_warnings():
246
240
                warnings.simplefilter('ignore')