Rev 5457: Make the test depends on a feature so it's skipped if meliae is not installed in file:///home/vila/src/bzr/reviews/551391-log-memory-usage/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/551391-log-memory-usage/

------------------------------------------------------------
revno: 5457
revision-id: v.ladeuil+lp at free.fr-20101011095316-grl1yn3o5j7uo419
parent: 7mq3cbbd9q at snkmail.com-20101006133450-jjsl0bdfekwj8gmf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 551391-log-memory-usage
timestamp: Mon 2010-10-11 11:53:16 +0200
message:
  Make the test depends on a feature so it's skipped if meliae is not installed
-------------- next part --------------
=== modified file 'bzrlib/tests/features.py'
--- a/bzrlib/tests/features.py	2010-09-27 19:31:45 +0000
+++ b/bzrlib/tests/features.py	2010-10-11 09:53:16 +0000
@@ -38,12 +38,14 @@
 
 
 not_running_as_root = _NotRunningAsRoot()
+
 apport = tests.ModuleAvailableFeature('apport')
+meliae = tests.ModuleAvailableFeature('meliae')
 paramiko = tests.ModuleAvailableFeature('paramiko')
 pycurl = tests.ModuleAvailableFeature('pycurl')
 pywintypes = tests.ModuleAvailableFeature('pywintypes')
+sphinx = tests.ModuleAvailableFeature('sphinx')
 subunit = tests.ModuleAvailableFeature('subunit')
-sphinx = tests.ModuleAvailableFeature('sphinx')
 
 
 class _BackslashDirSeparatorFeature(tests.Feature):

=== modified file 'bzrlib/tests/test_trace.py'
--- a/bzrlib/tests/test_trace.py	2010-10-06 13:34:50 +0000
+++ b/bzrlib/tests/test_trace.py	2010-10-11 09:53:16 +0000
@@ -85,6 +85,7 @@
             "bzr: out of memory\nUse -Dmem_dump to dump memory to a file.\n")
 
     def test_format_mem_dump(self):
+        self.requireFeature(features.meliae)
         debug.debug_flags.add('mem_dump')
         try:
             raise MemoryError()