/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: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upstream_import.py
236
236
            self.assertTrue(tree.path2id('README') is not None)
237
237
            self.assertTrue(tree.path2id('FEEDME') is not None)
238
238
            self.assertTrue(os.path.isfile(tree.abspath('README')))
239
 
            self.assertEqual(tree.stored_kind(tree.path2id('README')),
240
 
                'file')
241
 
            self.assertEqual(tree.stored_kind(tree.path2id('FEEDME')),
242
 
                'file')
 
239
            self.assertEqual(tree.stored_kind('README'), 'file')
 
240
            self.assertEqual(tree.stored_kind('FEEDME'), 'file')
243
241
            f = file(tree.abspath('junk/food'), 'wb')
244
242
            f.write('I like food\n')
245
243
            f.close()
250
248
                importer(tree, archive_file)
251
249
            self.assertTrue(tree.path2id('README') is not None)
252
250
            # Ensure the second version of the file is used.
253
 
            self.assertEqual(tree.get_file_text(tree.path2id('README')),
254
 
                             'Wow?')
 
251
            self.assertEqual(tree.get_file_text('README'), 'Wow?')
255
252
            self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))
256
253
        finally:
257
254
            tree.unlock()