/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/tests/test_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
173
173
        found_format = bzrrepository.RepositoryFormatMetaDir.find_format(tree.controldir)
174
174
        self.assertIsInstance(found_format, bzrrepository.RepositoryFormatMetaDir)
175
175
        self.assertEqual(found_format.features.get("name"), "necessity")
176
 
        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
 
176
        self.assertRaises(bzrdir.MissingFeature, found_format.check_support_status,
177
177
            True)
178
178
        self.addCleanup(bzrrepository.RepositoryFormatMetaDir.unregister_feature,
179
179
            "name")
1721
1721
        repo = self.make_repository('.')
1722
1722
        repo.lock_write()
1723
1723
        repo._format.features["makes-cheese-sandwich"] = "required"
1724
 
        self.assertRaises(errors.MissingFeature,
 
1724
        self.assertRaises(bzrdir.MissingFeature,
1725
1725
            repo._format.check_support_status, False)