Bazaar

Merge lp:~vila/bzr/551391-log-memory-usage into lp:bzr

  1. 551391-log-memory-usage
  2. Merge into bzr.dev
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 5484
Proposed branch: lp:~vila/bzr/551391-log-memory-usage
Merge into: lp:bzr
Prerequisite: lp:~kbielefe/bzr/551391-log-memory-usage
Diff against target: 31 lines (+4/-1) (has conflicts)
2 files modified
bzrlib/tests/features.py (+3/-1)
bzrlib/tests/test_trace.py (+1/-0)
Text conflict in NEWS
To merge this branch: bzr merge lp:~vila/bzr/551391-log-memory-usage
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+38103@code.launchpad.net

Commit message

Add a 'meliae' feature.

Description of the change

This added a 'meliae' feature and changes a test to depend on it so the test is skipped when meliae is not installed.

This allows landing lp:~kbielefe/bzr/551391-log-memory-usage.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Revision history for this message
Martin Pool (mbp) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/features.py'
2--- bzrlib/tests/features.py 2010-09-27 19:31:45 +0000
3+++ bzrlib/tests/features.py 2010-10-11 09:59:44 +0000
4@@ -38,12 +38,14 @@
5
6
7 not_running_as_root = _NotRunningAsRoot()
8+
9 apport = tests.ModuleAvailableFeature('apport')
10+meliae = tests.ModuleAvailableFeature('meliae')
11 paramiko = tests.ModuleAvailableFeature('paramiko')
12 pycurl = tests.ModuleAvailableFeature('pycurl')
13 pywintypes = tests.ModuleAvailableFeature('pywintypes')
14+sphinx = tests.ModuleAvailableFeature('sphinx')
15 subunit = tests.ModuleAvailableFeature('subunit')
16-sphinx = tests.ModuleAvailableFeature('sphinx')
17
18
19 class _BackslashDirSeparatorFeature(tests.Feature):
20
21=== modified file 'bzrlib/tests/test_trace.py'
22--- bzrlib/tests/test_trace.py 2010-10-11 09:59:43 +0000
23+++ bzrlib/tests/test_trace.py 2010-10-11 09:59:44 +0000
24@@ -85,6 +85,7 @@
25 "bzr: out of memory\nUse -Dmem_dump to dump memory to a file.\n")
26
27 def test_format_mem_dump(self):
28+ self.requireFeature(features.meliae)
29 debug.debug_flags.add('mem_dump')
30 try:
31 raise MemoryError()