← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_update.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_update.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
from bzrlib import (
19
19
    branch,
20
20
    builtins,
 
21
    tests,
21
22
    )
22
23
from bzrlib.tests import transport_util
23
24
 
36
37
        self.start_logging_connections()
37
38
 
38
39
        update = builtins.cmd_update()
 
40
        # update needs the encoding from outf to print URLs
 
41
        update.outf = tests.StringIOWrapper()
39
42
        # update calls it 'dir' where other commands calls it 'directory'
40
 
        update.run(dir='local')
 
43
        update.run_direct(dir='local')
41
44
        self.assertEquals(1, len(self.connections))
42
45