← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_tree/test_path_content_summary.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/test_path_content_summary.py
133
133
        self.assertEqual('file', summary[0])
134
134
        self.check_content_summary_size(tree, summary, 22)
135
135
        # not executable
136
 
        if osutils.supports_executable:
137
 
            self.assertEqual(False, summary[2])
138
 
        else:
139
 
            self.assertEqual(None, summary[2])
 
136
        self.assertEqual(False, summary[2])
140
137
        # may have hash,
141
138
        self.assertSubset((summary[3],),
142
139
            (None, '0c352290ae1c26ca7f97d5b2906c4624784abd60'))