/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Rework test_script a little bit.


Don't allow someone to request a stdin request to echo.
Echo never reads from stdin, it just echos its arguments.
You use 'cat' if you want to read from stdin.

A few other fixes because the tests were using filenames
that are actually illegal on Windows, rather than just
nonexistant.


Change the exception handling for commands so that
unknown errors don't get silently squashed and then
turn into hard-to-debug errors later.

test_script now passes on Windows.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009 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
22
22
 
23
23
from bzrlib import (
24
24
    branch as _mod_branch,
25
 
    osutils,
26
25
    urlutils,
27
26
    )
28
27
from bzrlib.bzrdir import BzrDirMetaFormat1
75
74
Using shared repository: %s
76
75
""" % (self._default_label, urlutils.local_path_from_url(
77
76
            repo.bzrdir.root_transport.external_url())), out)
78
 
        cwd = osutils.getcwd()
79
 
        self.assertEndsWith(out, cwd + '/repo/\n')
 
77
        self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
 
78
            "test_init_at_repository_root/work/repo/\n")
80
79
        self.assertEqual('', err)
81
80
        newdir.open_branch()
82
81
        newdir.open_workingtree()
196
195
    def test_init_append_revisions_only(self):
197
196
        self.run_bzr('init --dirstate-tags normal_branch6')
198
197
        branch = _mod_branch.Branch.open('normal_branch6')
199
 
        self.assertEqual(None, branch._get_append_revisions_only())
 
198
        self.assertEqual(False, branch._get_append_revisions_only())
200
199
        self.run_bzr('init --append-revisions-only --dirstate-tags branch6')
201
200
        branch = _mod_branch.Branch.open('branch6')
202
201
        self.assertEqual(True, branch._get_append_revisions_only())