← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/test_baz_import.py

  • Committer: Aaron Bentley
  • Date: 2005-10-03 14:42:47 UTC
  • mfrom: (147.1.31)
  • mto: (147.2.17)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: abentley@panoramicfeedback.com-20051003144246-c3432e45057089db
Merged latest upstream changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_baz_import.py
265
265
        self.assertEqual(rev.committer, "Test User<test@example.org>")
266
266
        self.assertEqual(rev.message, "did a merge, yarh")
267
267
        self.assertEqual(rev.revision_id, self._baz._empty_merged_tag_bzr)
268
 
        self.assertEqual(rev.parents[0].revision_id,
 
268
        self.assertEqual(rev.parent_ids[0],
269
269
                         self._baz._empty_merged_tag_bzr_base)
270
 
        self.assertEqual(rev.parents[1].revision_id,
271
 
                         self._baz._empty_tag_bzr)
 
270
        self.assertEqual(rev.parent_ids[1], self._baz._empty_tag_bzr)
272
271
 
273
272
        # this tree should have nothing missing from that tree.   
274
273
        # FIXME there is no code for this right now.
319
318
        self.assertEqual(rev.committer, "Test User<test@example.org>")
320
319
        self.assertEqual(rev.message, "merge in a merged tree.")
321
320
        self.assertEqual(rev.revision_id, self._baz._empty_merged_tag_2_bzr)
322
 
        self.assertEqual(rev.parents[0].revision_id,
 
321
        self.assertEqual(rev.parent_ids[0],
323
322
                         self._baz._empty_merged_tag_2_bzr_base)
324
 
        self.assertEqual(rev.parents[1].revision_id,
 
323
        self.assertEqual(rev.parent_ids[1],
325
324
                         self._baz._empty_merged_tag_bzr)
326
325
 
327
326
        # this tree should have nothing missing from that tree.   
352
351
        self.assertEqual(rev.revision_id, self._baz._import_symlink_bzr)
353
352
 
354
353
        # and we want the symlink alink with target 'missing-file-name'
355
 
        inv = branch.get_inventory(rev.inventory_id)
 
354
        inv = branch.get_inventory(rev.revision_id)
356
355
        self.assertEqual(inv.path2id('alink'), 'x_symlink_tag')
357
356
        entry = inv['x_symlink_tag']
358
357
        self.assertEqual(entry.kind, 'symlink')
382
381
        self.assertEqual(rev.committer, "Test User<test@example.org>")
383
382
        self.assertEqual(rev.message, "tag of demo-gone@DONOTUSE/c--import--0--base-0")
384
383
        self.assertEqual(rev.revision_id, self._baz._missing_ancestor_bzr)
385
 
        self.assertEqual(rev.parents[0].revision_id,
386
 
                         self._baz._missing_import_bzr)
387
 
        self.assertEqual(1, len(rev.parents))
 
384
        self.assertEqual(rev.parent_ids[0], self._baz._missing_import_bzr)
 
385
        self.assertEqual(1, len(rev.parent_ids))
388
386
 
389
387
        # must NOT be able to get the merged evision
390
388
        self.assertRaises(NoSuchRevision, branch.get_revision, 
484
482
        self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output')))
485
483
        self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output', 'c','+trunk')))
486
484
        self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output', 'c1', '0.2','branch')))
487
 
        self.assertEqual(14, 
 
485
        self.assertEqual(12,
488
486
                        len(list(os.walk(os.path.join(self._tmpdir,'output')))))
489
487
 
490
488
    def test_run_twice(self):