Rev 6104: (vila) Fix meliae test feature definitions. (Max Bowsher) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6104 [merge]
revision-id: pqm at pqm.ubuntu.com-20110826095404-1b0s2cpvcf97ox0z
parent: pqm at pqm.ubuntu.com-20110826005059-8nw3lheuht9xt8z7
parent: _ at maxb.eu-20110823092927-c7fnueriuunvv9mh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2011-08-26 09:54:04 +0000
message:
  (vila) Fix meliae test feature definitions. (Max Bowsher)
modified:
  bzrlib/tests/features.py       features.py-20090820042958-jglgza3wrn03ha9e-1
  bzrlib/tests/test__static_tuple.py test__keys_type.py-20090908204220-aa346ccw4l37jzt7-2
=== modified file 'bzrlib/tests/features.py'
--- a/bzrlib/tests/features.py	2011-08-16 14:14:39 +0000
+++ b/bzrlib/tests/features.py	2011-08-23 09:29:27 +0000
@@ -346,7 +346,7 @@
 apport = ModuleAvailableFeature('apport')
 gpgme = ModuleAvailableFeature('gpgme')
 lzma = ModuleAvailableFeature('lzma')
-meliae = ModuleAvailableFeature('meliae')
+meliae = ModuleAvailableFeature('meliae.scanner')
 paramiko = ModuleAvailableFeature('paramiko')
 pycurl = ModuleAvailableFeature('pycurl')
 pywintypes = ModuleAvailableFeature('pywintypes')
@@ -356,7 +356,6 @@
 
 compiled_patiencediff_feature = ModuleAvailableFeature(
     'bzrlib._patiencediff_c')
-meliae_feature = ModuleAvailableFeature('meliae.scanner')
 lsprof_feature = ModuleAvailableFeature('bzrlib.lsprof')
 
 

=== modified file 'bzrlib/tests/test__static_tuple.py'
--- a/bzrlib/tests/test__static_tuple.py	2011-06-14 01:26:41 +0000
+++ b/bzrlib/tests/test__static_tuple.py	2011-08-23 09:29:27 +0000
@@ -432,7 +432,7 @@
         # amount of referenced memory. Unfortunately gc.get_referents() first
         # checks the IS_GC flag before it traverses anything. We could write a
         # helper func, but that won't work for the generic implementation...
-        self.requireFeature(features.meliae_feature)
+        self.requireFeature(features.meliae)
         from meliae import scanner
         strs = ['foo', 'bar', 'baz', 'bing']
         k = self.module.StaticTuple(*strs)
@@ -443,7 +443,7 @@
         self.assertEqual(sorted(refs), sorted(scanner.get_referents(k)))
 
     def test_nested_referents(self):
-        self.requireFeature(features.meliae_feature)
+        self.requireFeature(features.meliae)
         from meliae import scanner
         strs = ['foo', 'bar', 'baz', 'bing']
         k1 = self.module.StaticTuple(*strs[:2])