/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-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upstream_import.py
233
233
        tree.lock_write()
234
234
        try:
235
235
            importer(tree, archive_file)
236
 
            self.assertTrue(tree.path2id('README') is not None)
237
 
            self.assertTrue(tree.path2id('FEEDME') is not None)
 
236
            self.assertTrue(tree.is_versioned('README'))
 
237
            self.assertTrue(tree.is_versioned('FEEDME'))
238
238
            self.assertTrue(os.path.isfile(tree.abspath('README')))
239
239
            self.assertEqual(tree.stored_kind('README'), 'file')
240
240
            self.assertEqual(tree.stored_kind('FEEDME'), 'file')
246
246
                warnings.simplefilter('ignore')
247
247
                archive_file = self.make_archive2(builder, subdir)
248
248
                importer(tree, archive_file)
249
 
            self.assertTrue(tree.path2id('README') is not None)
 
249
            self.assertTrue(tree.is_versioned('README'))
250
250
            # Ensure the second version of the file is used.
251
251
            self.assertEqual(tree.get_file_text('README'), 'Wow?')
252
252
            self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))
258
258
        tar_file = self.make_messed_tar()
259
259
        tree = BzrDir.create_standalone_workingtree('tree')
260
260
        import_tar(tree, tar_file)
261
 
        self.assertTrue(tree.path2id('project-0.1/README') is not None)
 
261
        self.assertTrue(tree.is_versioned('project-0.1/README'))
262
262
 
263
263
    def test_untar_gzip(self):
264
264
        tar_file = self.make_tar(mode='w:gz')
265
265
        tree = BzrDir.create_standalone_workingtree('tree')
266
266
        import_tar(tree, tar_file)
267
 
        self.assertTrue(tree.path2id('README') is not None)
 
267
        self.assertTrue(tree.is_versioned('README'))
268
268
 
269
269
    def test_no_crash_with_bzrdir(self):
270
270
        tar_file = self.make_tar_with_bzrdir()