← 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: Patch Queue Manager
  • Date: 2016-01-31 13:36:59 UTC
  • mfrom: (6613.1.5 1538480-match-hostname)
  • Revision ID: pqm@pqm.ubuntu.com-20160131133659-ouy92ee2wlv9xz8m
(vila) Use ssl.match_hostname instead of our own. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
18
18
 
19
19
from cStringIO import StringIO
20
20
 
21
 
from bzrlib import config, errors, ignores
22
 
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
 
21
from bzrlib import (
 
22
    config,
 
23
    ignores,
 
24
    )
 
25
from bzrlib.tests import (
 
26
    TestCase,
 
27
    TestCaseInTempDir,
 
28
    TestCaseWithTransport,
 
29
    )
23
30
 
24
31
 
25
32
class TestParseIgnoreFile(TestCase):
69
76
    def test_create_if_missing(self):
70
77
        # $HOME should be set to '.'
71
78
        ignore_path = config.user_ignore_config_filename()
72
 
        self.failIfExists(ignore_path)
 
79
        self.assertPathDoesNotExist(ignore_path)
73
80
        user_ignores = ignores.get_user_ignores()
74
81
        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
75
82
 
76
 
        self.failUnlessExists(ignore_path)
 
83
        self.assertPathExists(ignore_path)
77
84
        f = open(ignore_path, 'rb')
78
85
        try:
79
86
            entries = ignores.parse_ignore_file(f)
142
149
class TestRuntimeIgnores(TestCase):
143
150
 
144
151
    def setUp(self):
145
 
        TestCase.setUp(self)
 
152
        super(TestRuntimeIgnores, self).setUp()
146
153
 
147
154
        # For the purposes of these tests, we must have no
148
155
        # runtime ignores