← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_lsprof.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_lsprof.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from bzrlib import tests
18
 
from bzrlib.tests import test_lsprof
 
18
from bzrlib.tests import features
19
19
 
20
20
 
21
21
class TestLSProf(tests.TestCaseInTempDir):
22
22
 
23
 
    _test_needs_features = [test_lsprof.LSProfFeature]
 
23
    _test_needs_features = [features.lsprof_feature]
24
24
 
25
25
    def test_file(self):
26
26
        out, err = self.run_bzr('--lsprof-file output.callgrind rocks')