← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__static_tuple.py

  • Committer: Max Bowsher
  • Date: 2011-08-23 09:29:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6104.
  • Revision ID: _@maxb.eu-20110823092927-c7fnueriuunvv9mh
Per jam's review comments, get rid of features.meliae_feature, which is new in
2.5 and so will not be missed, assigning the corrected behaviour to the
features.meliae name.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__static_tuple.py
432
432
        # amount of referenced memory. Unfortunately gc.get_referents() first
433
433
        # checks the IS_GC flag before it traverses anything. We could write a
434
434
        # helper func, but that won't work for the generic implementation...
435
 
        self.requireFeature(features.meliae_feature)
 
435
        self.requireFeature(features.meliae)
436
436
        from meliae import scanner
437
437
        strs = ['foo', 'bar', 'baz', 'bing']
438
438
        k = self.module.StaticTuple(*strs)
443
443
        self.assertEqual(sorted(refs), sorted(scanner.get_referents(k)))
444
444
 
445
445
    def test_nested_referents(self):
446
 
        self.requireFeature(features.meliae_feature)
 
446
        self.requireFeature(features.meliae)
447
447
        from meliae import scanner
448
448
        strs = ['foo', 'bar', 'baz', 'bing']
449
449
        k1 = self.module.StaticTuple(*strs[:2])