← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ignores.py

  • Committer: Martin Pool
  • Date: 2006-11-02 10:20:19 UTC
  • mfrom: (2114 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2119.
  • Revision ID: mbp@sourcefrog.net-20061102102019-9a5a02f485dff6f6
merge bzr.dev and reconcile several changes, also some test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
1
 
# Copyright (C) 2006 by Canonical Ltd
 
1
# Copyright (C) 2006 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
99
99
        self.assertEqual(patterns, added)
100
100
        self.assertEqual(set(patterns), ignores.get_user_ignores())
101
101
 
 
102
    def test_add_directory(self):
 
103
        """Test that adding a directory will strip any trailing slash"""
 
104
        # Create an empty file
 
105
        ignores._set_user_ignores([])
 
106
 
 
107
        in_patterns = ['foo/', 'bar/']
 
108
        added = ignores.add_unique_user_ignores(in_patterns)
 
109
        out_patterns = [ x.rstrip('/') for x in in_patterns ]
 
110
        self.assertEqual(out_patterns, added)
 
111
        self.assertEqual(set(out_patterns), ignores.get_user_ignores())
 
112
 
102
113
    def test_add_unique(self):
103
114
        """Test that adding will not duplicate ignores"""
104
 
        ignores._set_user_ignores(['foo', './bar', u'b\xe5z'])
 
115
        ignores._set_user_ignores(['foo', './bar', u'b\xe5z', 'dir1/'])
105
116
 
106
 
        added = ignores.add_unique_user_ignores(['xxx', './bar', 'xxx'])
107
 
        self.assertEqual(['xxx'], added)
108
 
        self.assertEqual(set(['foo', './bar', u'b\xe5z', 'xxx']),
 
117
        added = ignores.add_unique_user_ignores(
 
118
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/'])
 
119
        self.assertEqual(['xxx', 'dir2'], added)
 
120
        self.assertEqual(set(['foo', './bar', u'b\xe5z', 
 
121
                              'xxx', 'dir1', 'dir2']),
109
122
                         ignores.get_user_ignores())
110
123
 
111
124