← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-13 19:33:17 UTC
  • mfrom: (2817.1.1 Aaron's integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070913193317-hi3rhwxhbrviw7hz
Clean up test_ignored, add test_unknowns (Daniel Watkins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ignore.py
45
45
 
46
46
    def test_ignore_absolutes(self):
47
47
        """'ignore' with an absolute path returns an error"""
48
 
        self.run_bzr('init')
 
48
        self.make_branch_and_tree('.')
49
49
        self.run_bzr_error(('bzr: ERROR: NAME_PATTERN should not '
50
50
                            'be an absolute path\n',),
51
51
                           'ignore /crud')
64
64
        self.assertEquals(self.run_bzr('unknowns')[0], 'dir3\n')
65
65
 
66
66
    def test_ignore_patterns(self):
67
 
        self.run_bzr('init')
68
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
67
        tree = self.make_branch_and_tree('.')
 
68
 
 
69
        self.assertEquals(list(tree.unknowns()), [])
69
70
 
70
71
        # is_ignored() will now create the user global ignore file
71
72
        # if it doesn't exist, so make sure we ignore it in our tests
72
73
        ignores._set_user_ignores(['*.tmp'])
73
74
 
74
75
        self.build_tree_contents(
75
 
            [('foo.tmp', '.tmp files are ignored by default'),
76
 
             ])
77
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
78
 
 
79
 
        file('foo.c', 'wt').write('int main() {}')
80
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'foo.c\n')
81
 
 
82
 
        self.run_bzr('add foo.c')
83
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
76
            [('foo.tmp', '.tmp files are ignored by default')])
 
77
        self.assertEquals(list(tree.unknowns()), [])
 
78
 
 
79
        self.build_tree_contents([('foo.c', 'int main() {}')])
 
80
        self.assertEquals(list(tree.unknowns()), ['foo.c'])
 
81
 
 
82
        tree.add('foo.c')
 
83
        self.assertEquals(list(tree.unknowns()), [])
84
84
 
85
85
        # 'ignore' works when creating the .bzrignore file
86
 
        file('foo.blah', 'wt').write('blah')
87
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'foo.blah\n')
 
86
        self.build_tree_contents([('foo.blah', 'blah')])
 
87
        self.assertEquals(list(tree.unknowns()), ['foo.blah'])
88
88
        self.run_bzr('ignore *.blah')
89
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
89
        self.assertEquals(list(tree.unknowns()), [])
90
90
        self.check_file_contents('.bzrignore', '*.blah\n')
91
91
 
92
92
        # 'ignore' works when then .bzrignore file already exists
93
 
        file('garh', 'wt').write('garh')
94
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'garh\n')
 
93
        self.build_tree_contents([('garh', 'garh')])
 
94
        self.assertEquals(list(tree.unknowns()), ['garh'])
95
95
        self.run_bzr('ignore garh')
96
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
96
        self.assertEquals(list(tree.unknowns()), [])
97
97
        self.check_file_contents('.bzrignore', '*.blah\ngarh\n')
98
98
       
99
99
    def test_ignore_multiple_arguments(self):
100
100
        """'ignore' works with multiple arguments"""
101
 
        self.run_bzr('init')
 
101
        tree = self.make_branch_and_tree('.')
102
102
        self.build_tree(['a','b','c','d'])
103
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'a\nb\nc\nd\n')
 
103
        self.assertEquals(list(tree.unknowns()), ['a', 'b', 'c', 'd'])
104
104
        self.run_bzr('ignore a b c')
105
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'd\n')
 
105
        self.assertEquals(list(tree.unknowns()), ['d'])
106
106
        self.check_file_contents('.bzrignore', 'a\nb\nc\n')
107
107
 
108
108
    def test_ignore_no_arguments(self):
109
109
        """'ignore' with no arguments returns an error"""
110
 
        self.run_bzr('init')
 
110
        self.make_branch_and_tree('.')
111
111
        self.run_bzr_error(('bzr: ERROR: ignore requires at least one '
112
112
                            'NAME_PATTERN or --old-default-rules\n',),
113
113
                           'ignore')