← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_globbing.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_globbing.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
26
26
    )
27
27
from bzrlib.tests import (
28
28
    TestCase,
29
 
    TestCaseInTempDir,
30
29
    )
31
30
 
32
31
 
38
37
                glob = glob_prefix + glob
39
38
            globster = Globster([glob])
40
39
            for name in positive:
41
 
                self.failUnless(globster.match(name), repr(
 
40
                self.assertTrue(globster.match(name), repr(
42
41
                    u'name "%s" does not match glob "%s" (re=%s)' %
43
42
                    (name, glob, globster._regex_patterns[0][0].pattern)))
44
43
            for name in negative:
45
 
                self.failIf(globster.match(name), repr(
 
44
                self.assertFalse(globster.match(name), repr(
46
45
                    u'name "%s" does match glob "%s" (re=%s)' %
47
46
                    (name, glob, globster._regex_patterns[0][0].pattern)))
48
47