← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_clean_tree.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/blackbox/test_clean_tree.py
41
41
        self.run_bzr('ignore *.pyc')
42
42
        self.touch('name')
43
43
        self.touch('name~')
44
 
        self.failUnlessExists('name~')
 
44
        self.assertPathExists('name~')
45
45
        self.touch('name.pyc')
46
46
        self.run_bzr('clean-tree --force')
47
 
        self.failUnlessExists('name~')
48
 
        self.failIfExists('name')
 
47
        self.assertPathExists('name~')
 
48
        self.assertPathDoesNotExist('name')
49
49
        self.touch('name')
50
50
        self.run_bzr('clean-tree --detritus --force')
51
 
        self.failUnlessExists('name')
52
 
        self.failIfExists('name~')
53
 
        self.failUnlessExists('name.pyc')
 
51
        self.assertPathExists('name')
 
52
        self.assertPathDoesNotExist('name~')
 
53
        self.assertPathExists('name.pyc')
54
54
        self.run_bzr('clean-tree --ignored --force')
55
 
        self.failUnlessExists('name')
56
 
        self.failIfExists('name.pyc')
 
55
        self.assertPathExists('name')
 
56
        self.assertPathDoesNotExist('name.pyc')
57
57
        self.run_bzr('clean-tree --unknown --force')
58
 
        self.failIfExists('name')
 
58
        self.assertPathDoesNotExist('name')
59
59
        self.touch('name')
60
60
        self.touch('name~')
61
61
        self.touch('name.pyc')
62
62
        self.run_bzr('clean-tree --unknown --ignored --force')
63
 
        self.failIfExists('name')
64
 
        self.failIfExists('name~')
65
 
        self.failIfExists('name.pyc')
 
63
        self.assertPathDoesNotExist('name')
 
64
        self.assertPathDoesNotExist('name~')
 
65
        self.assertPathDoesNotExist('name.pyc')
66
66
 
67
67
    def test_clean_tree_nested_bzrdir(self):
68
68
        # clean-tree should not blindly delete nested bzrdirs (branches)
73
73
        wt3 = self.make_branch_and_tree('bar')
74
74
        ignores.tree_ignores_add_patterns(wt1, ['./foo'])
75
75
        self.run_bzr(['clean-tree', '--unknown', '--force'])
76
 
        self.failUnlessExists('foo')
77
 
        self.failUnlessExists('bar')
 
76
        self.assertPathExists('foo')
 
77
        self.assertPathExists('bar')
78
78
        self.run_bzr(['clean-tree', '--ignored', '--force'])
79
 
        self.failUnlessExists('foo')
80
 
        self.failUnlessExists('bar')
 
79
        self.assertPathExists('foo')
 
80
        self.assertPathExists('bar')
81
81
 
82
82
    def test_clean_tree_directory(self):
83
83
        """Test --directory option"""
85
85
        self.build_tree(['a/added', 'a/unknown', 'a/ignored'])
86
86
        tree.add('added')
87
87
        self.run_bzr('clean-tree -d a --unknown --ignored --force')
88
 
        self.failIfExists('a/unknown')
89
 
        self.failIfExists('a/ignored')
90
 
        self.failUnlessExists('a/added')
 
88
        self.assertPathDoesNotExist('a/unknown')
 
89
        self.assertPathDoesNotExist('a/ignored')
 
90
        self.assertPathExists('a/added')