← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ignored.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-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
38
38
        out, err = self.run_bzr('ignored')
39
39
        self.assertEqual('', out)
40
40
        self.assertEqual('', err)
 
41
 
 
42
    def test_ignored_directory(self):
 
43
        """Test --directory option"""
 
44
        tree = self.make_branch_and_tree('a')
 
45
        self.build_tree_contents([('a/README', 'contents'),
 
46
                                  ('a/.bzrignore', 'README')])
 
47
        out, err = self.run_bzr(['ignored', '--directory=a'])
 
48
        self.assertStartsWith(out, 'README')