/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_added.py

  • Committer: Vincent Ladeuil
  • Date: 2007-09-10 12:12:47 UTC
  • mto: (2810.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2813.
  • Revision ID: v.ladeuil+lp@free.fr-20070910121247-sxf4l4pq1e27380p
Fix #128076 and #131396 by reusing bound branch transport.

* bzrlib/bzrdir.py:
(BzrDir.open): Add possible_transports as the last parameter.

* bzrlib/builtins.py:
(cmd_update.run): Use possible_transports parameter to obtain the
master branch transport and reuse it.

* bzrlib/branch.py:
(Branch.open, Branch.get_master_branch,
BzrBranch5.get_master_branch, BzrBranch5.update): Add
possible_transports as the last parameter.

* bzrlib/workingtree.py:
(WorkingTree.update): Add possible_transports as the last parameter.

* bzrlib/tests/commands/test_update.py:
(TestUpdate.test_update): Ignore connections from bind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_added.py
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
# -*- coding: utf-8 -*-
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 
 
18
 
 
19
"""Black-box tests for 'bzr added', which shows newly-added files."""
 
20
 
 
21
import os
 
22
 
 
23
from bzrlib.branch import Branch
 
24
from bzrlib.tests.blackbox import ExternalBase
 
25
 
 
26
class TestAdded(ExternalBase):
 
27
 
 
28
    def test_added(self):
 
29
        """Test that 'added' command reports added files"""
 
30
 
 
31
        def check_added(expected):
 
32
            out, err = self.run_bzr('added')
 
33
            self.assertEquals(out, expected)
 
34
            self.assertEquals(err, '')
 
35
 
 
36
        # in empty directory, nothing added
 
37
        tree = self.make_branch_and_tree('.')
 
38
        check_added('')
 
39
 
 
40
        # with unknown file, still nothing added
 
41
        self.build_tree_contents([('a', 'contents of a\n')])
 
42
        check_added('')
 
43
 
 
44
        # after add, shows up in list
 
45
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
 
46
        # NameError
 
47
        tree.add('a')
 
48
        check_added('a\n')
 
49
 
 
50
        # after commit, now no longer listed
 
51
        tree.commit(message='add a')
 
52
        check_added('')