← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
83
83
        self.assertIsInstance(
84
84
            SampleTreeFormat.from_string("Sample tree format."),
85
85
            SampleTreeFormat)
86
 
        self.assertRaises(ValueError,
 
86
        self.assertRaises(AssertionError,
87
87
            SampleTreeFormat.from_string, "Different format string.")
88
88
 
89
89
    def test_get_set_default_format_by_key(self):
243
243
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
244
244
                workingtree.WorkingTreeFormat.get_formats))
245
245
 
 
246
    def test_find_format_with_features(self):
 
247
        tree = self.make_branch_and_tree('.', format='2a')
 
248
        tree.update_feature_flags({"name": "necessity"})
 
249
        found_format = workingtree.WorkingTreeFormatMetaDir.find_format(
 
250
            tree.bzrdir)
 
251
        self.assertIsInstance(found_format, workingtree.WorkingTreeFormat)
 
252
        self.assertEquals(found_format.features.get("name"), "necessity")
 
253
        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
 
254
            True)
 
255
        self.addCleanup(workingtree.WorkingTreeFormatMetaDir.unregister_feature,
 
256
            "name")
 
257
        workingtree.WorkingTreeFormatMetaDir.register_feature("name")
 
258
        found_format.check_support_status(True)
 
259
 
246
260
 
247
261
class TestWorkingTreeIterEntriesByDir_wSubtrees(TestCaseWithTransport):
248
262