← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2010-08-10 20:03:44 UTC
  • mto: This revision was merged to the branch mainline in revision 5376.
  • Revision ID: john@arbash-meinel.com-20100810200344-6muerwvkafqu7w47
Rework things a bit so the logic can be shared.

It turns out that some of the peak memory is actually during the inventory
to string to bundle translations. So re-use the refcount logic there.
This actually does show a decrease in peak memory.
Specifically 'cd bzr.dev; bzr send ../2.2' drops from 221MB peak to 156MB.

We don't speed anything up (16.5s both ways), but peak memory is quite
a bit better.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_added.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
21
21
import os
22
22
 
23
23
from bzrlib.branch import Branch
24
 
from bzrlib.tests.blackbox import ExternalBase
25
 
 
26
 
 
27
 
class TestAdded(ExternalBase):
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
 
 
26
 
 
27
class TestAdded(TestCaseWithTransport):
28
28
 
29
29
    def test_added(self):
30
30
        """Test that 'added' command reports added files"""
67
67
        # after commit, now no longer listed
68
68
        tree.commit(message='add "%s"' % (name))
69
69
        check_added('')
 
70
 
 
71
    def test_added_directory(self):
 
72
        """Test --directory option"""
 
73
        tree = self.make_branch_and_tree('a')
 
74
        self.build_tree(['a/README'])
 
75
        tree.add('README')
 
76
        out, err = self.run_bzr(['added', '--directory=a'])
 
77
        self.assertEquals('README\n', out)