← 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: 2007-07-05 17:04:38 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070705170438-74dsm7b1bcs4d9hu
Fix deprecation warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_baz_import.py
741
741
        command.run(os.path.join(self._tmpdir, 'output'), 'demo@DONOTUSE')
742
742
        self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output')))
743
743
        walk_len = len(list(os.walk(os.path.join(self._tmpdir,'output'))))
744
 
        self.assertEqual(9, walk_len)
 
744
        self.assertEqual(7, walk_len)
745
745
 
746
746
    def test_two_branches(self):
747
747
        self.make_import('c--0')
754
754
        self.failUnless(os.path.exists(os.path.join(self._tmpdir,'output',
755
755
                                                    'c1', '0.2','branch')))
756
756
        default_format = repository.RepositoryFormat.get_default_format()
 
757
        if getattr(default_format, 'rich_root_data', False):
 
758
            num_files = 21
 
759
        else:
 
760
            num_files = 20
757
761
        walk_len = len(list(os.walk(os.path.join(self._tmpdir,'output'))))
758
 
        self.assertEqual(22, walk_len)
 
762
        self.assertEqual(num_files, walk_len)
759
763
 
760
764
    def test_run_twice(self):
761
765
        self.make_import('c--0')