/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 breezy/tests/blackbox/test_ignore.py

  • Committer: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_ignore.py
122
122
        # test a single versioned file
123
123
        out, err = self.run_bzr('ignore a')
124
124
        self.assertEqual(out,
125
 
                         "Warning: the following files are version controlled"\
126
 
                         " and match your ignore pattern:\na\n"\
127
 
                         "These files will continue to be version controlled"\
 
125
                         "Warning: the following files are version controlled"
 
126
                         " and match your ignore pattern:\na\n"
 
127
                         "These files will continue to be version controlled"
128
128
                         " unless you 'brz remove' them.\n")
129
129
 
130
130
        # test a single unversioned file
135
135
        tree.add('b')
136
136
        out, err = self.run_bzr('ignore *')
137
137
        self.assertEqual(out,
138
 
                         "Warning: the following files are version controlled"\
139
 
                         " and match your ignore pattern:\n.bzrignore\na\nb\n"\
140
 
                         "These files will continue to be version controlled"\
 
138
                         "Warning: the following files are version controlled"
 
139
                         " and match your ignore pattern:\n.bzrignore\na\nb\n"
 
140
                         "These files will continue to be version controlled"
141
141
                         " unless you 'brz remove' them.\n")
142
142
 
143
143
    def test_ignored_versioned_file_matching_new_pattern(self):
150
150
        # this case.
151
151
        out, err = self.run_bzr('ignore b')
152
152
        self.assertEqual(out,
153
 
                         "Warning: the following files are version controlled"\
154
 
                         " and match your ignore pattern:\nb\n"\
155
 
                         "These files will continue to be version controlled"\
 
153
                         "Warning: the following files are version controlled"
 
154
                         " and match your ignore pattern:\nb\n"
 
155
                         "These files will continue to be version controlled"
156
156
                         " unless you 'brz remove' them.\n")
157
157
 
158
158
    def test_ignore_directory(self):
172
172
        out, err = self.run_bzr(['ignore', 'RE:*.cpp', 'foo', 'RE:['], 3)
173
173
        self.assertEqual(out, '')
174
174
        self.assertContainsRe(err,
175
 
            r'Invalid ignore pattern.*RE:\*\.cpp.*RE:\[', re.DOTALL)
 
175
                              r'Invalid ignore pattern.*RE:\*\.cpp.*RE:\[', re.DOTALL)
176
176
        self.assertNotContainsRe(err, 'foo', re.DOTALL)
177
177
        self.assertFalse(os.path.isfile('.bzrignore'))
178