← 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: John Arbash Meinel
  • Date: 2011-05-11 11:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5851.
  • Revision ID: john@arbash-meinel.com-20110511113528-qepibuwxicjrbb2h
Break compatibility with python <2.6.

This includes auditing the code for places where we were doing
explicit 'sys.version' checks and removing them as appropriate.

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)