← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-11-16 20:52:38 UTC
  • mfrom: (4789.20.3 2.1.0b3-glob-updates)
  • mto: This revision was merged to the branch mainline in revision 4800.
  • Revision ID: john@arbash-meinel.com-20091116205238-dxub89y5jt5foo6y
Include the glob updates.

Technically this wasn't approved, but the tests pass, it adds tests on Linux,
and the timeout for review has certainly passed. I'm also not worried as it
is primarily a test-suite fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
27
27
    SymlinkFeature
28
28
    )
29
29
from bzrlib.tests.blackbox import ExternalBase
30
 
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
31
30
 
32
31
 
33
32
def load_tests(standard_tests, module, loader):
211
210
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
212
211
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
213
212
 
214
 
    def test_add_with_wildcards(self):
215
 
        self.requireFeature(NeedsGlobExpansionFeature)
216
 
        self.make_branch_and_tree('.')
217
 
        self.build_tree(['a1', 'a2', 'b', 'c33'])
218
 
        self.run_bzr(['add', 'a?', 'c*'])
219
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
220
 
 
221
 
    def test_add_with_wildcards_unicode(self):
222
 
        self.requireFeature(NeedsGlobExpansionFeature)
223
 
        self.make_branch_and_tree('.')
224
 
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
225
 
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
226
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')
227
 
 
228
213
    def test_add_via_symlink(self):
229
214
        self.requireFeature(SymlinkFeature)
230
215
        self.make_branch_and_tree('source')