← 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

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_executable.py
189
189
        self.assertFalse(b_executable)
190
190
 
191
191
    def test_use_exec_from_basis(self):
192
 
        if osutils.supports_executable():
193
 
            self.assertEqual(self.wt._is_executable_from_path_and_stat_from_stat,
194
 
                             self.wt._is_executable_from_path_and_stat)
195
 
        else:
196
 
            self.assertEqual(self.wt._is_executable_from_path_and_stat_from_basis,
197
 
                             self.wt._is_executable_from_path_and_stat)
 
192
        self.wt._supports_executable = lambda: False
 
193
        self.addCleanup(self.wt.lock_read().unlock)
 
194
        self.assertTrue(self.wt.is_executable(self.a_id))
 
195
        self.assertFalse(self.wt.is_executable(self.b_id))