← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_executable.py

Merge bzr.dev, update to use new hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_executable.py
21
21
from bzrlib import (
22
22
    osutils,
23
23
    )
24
 
from bzrlib.inventory import InventoryFile
25
24
from bzrlib.transform import TreeTransform
26
25
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
27
26
 
44
43
    def check_exist(self, tree):
45
44
        """Just check that both files have the right executable bits set"""
46
45
        tree.lock_read()
47
 
        self.failUnless(tree.is_executable(self.a_id),
 
46
        self.assertTrue(tree.is_executable(self.a_id),
48
47
                        "'a' lost the execute bit")
49
 
        self.failIf(tree.is_executable(self.b_id),
 
48
        self.assertFalse(tree.is_executable(self.b_id),
50
49
                    "'b' gained an execute bit")
51
50
        tree.unlock()
52
51
 
61
60
            self.assertEqual(
62
61
                [('', tree.inventory.root)],
63
62
                list(tree.inventory.iter_entries()))
64
 
        self.failIf(tree.has_id(self.a_id))
65
 
        self.failIf(tree.has_filename('a'))
66
 
        self.failIf(tree.has_id(self.b_id))
67
 
        self.failIf(tree.has_filename('b'))
 
63
        self.assertFalse(tree.has_id(self.a_id))
 
64
        self.assertFalse(tree.has_filename('a'))
 
65
        self.assertFalse(tree.has_id(self.b_id))
 
66
        self.assertFalse(tree.has_filename('b'))
68
67
        tree.unlock()
69
68
 
70
69
    def commit_and_branch(self):