← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_test_trees.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_test_trees.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for the test trees used by the tree_implementations tests."""
18
18
 
166
166
                'symlink',
167
167
                 ]),
168
168
            set(iter(tree)))
169
 
        # note that the order of the paths and fileids is deliberately 
 
169
        # note that the order of the paths and fileids is deliberately
170
170
        # mismatched to ensure that the result order is path based.
171
171
        self.assertEqual(
172
172
            [('', tree_root, 'directory'),
199
199
                 u'0utf\u1234file'.encode('utf8'),
200
200
                 ]),
201
201
            set(iter(tree)))
202
 
        # note that the order of the paths and fileids is deliberately 
 
202
        # note that the order of the paths and fileids is deliberately
203
203
        # mismatched to ensure that the result order is path based.
204
204
        self.assertEqual(
205
205
            [('', tree_root, 'directory'),