← 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: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_update.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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