~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-06-25 20:34:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100625203405-c74lxd3enklhaqf9
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its
selection when explicitly requested; this avoids many duplicate calls
being logged when helpers, wrappers and older code that manually calls
it are executed it is now logged deliberately by the ui setup code.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
21
21
import os
22
22
 
23
23
from bzrlib.branch import Branch
24
 
from bzrlib.tests.blackbox import ExternalBase
25
 
 
26
 
 
27
 
class TestAdded(ExternalBase):
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
 
 
26
 
 
27
class TestAdded(TestCaseWithTransport):
28
28
 
29
29
    def test_added(self):
30
30
        """Test that 'added' command reports added files"""
67
67
        # after commit, now no longer listed
68
68
        tree.commit(message='add "%s"' % (name))
69
69
        check_added('')
 
70
 
 
71
    def test_added_directory(self):
 
72
        """Test --directory option"""
 
73
        tree = self.make_branch_and_tree('a')
 
74
        self.build_tree(['a/README'])
 
75
        tree.add('README')
 
76
        out, err = self.run_bzr(['added', '--directory=a'])
 
77
        self.assertEquals('README\n', out)