~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2009-12-14 15:51:36 UTC
  • mto: (4894.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4895.
  • Revision ID: v.ladeuil+lp@free.fr-20091214155136-rf4nkqvxda9oiw4u
Cleanup tests and tweak the text displayed.

* bzrlib/tests/blackbox/test_update.py:
Fix imports and replace the assertContainsRe with assertEqualDiff
to make the test clearer, more robust and easier to debug.

* bzrlib/tests/commands/test_update.py: 
Fix imports.

* bzrlib/tests/blackbox/test_filtered_view_ops.py: 
Fix imports and strange accesses to base class methods.
(TestViewTreeOperations.test_view_on_update): Avoid os.chdir()
call, simplify string matching assertions.

* bzrlib/builtins.py:
(cmd_update.run): Fix spurious space, get rid of the final '/' for
the base path, don't add a final period (it's a legal char in a
path and would be annoying for people that like to copy/paste).

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
from bzrlib import (
19
19
    branch,
20
20
    builtins,
 
21
    tests,
21
22
    )
22
 
from bzrlib.tests import transport_util, StringIOWrapper
 
23
from bzrlib.tests import transport_util
23
24
 
24
25
 
25
26
class TestUpdate(transport_util.TestCaseWithConnectionHookedTransport):
37
38
 
38
39
        update = builtins.cmd_update()
39
40
        # update needs the encoding from outf to print URLs
40
 
        update.outf = StringIOWrapper()
 
41
        update.outf = tests.StringIOWrapper()
41
42
        # update calls it 'dir' where other commands calls it 'directory'
42
43
        update.run(dir='local')
43
44
        self.assertEquals(1, len(self.connections))