/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_tree/test_test_trees.py

• browse files at revision 7175
• compare with another revision
• compare with revision 5200.3.7
• download diff
• download tarball
• view history from revision 7175

Show diffs side-by-side

added

removed

breezy/tests/per_tree/test_test_trees.py

129

129

            {'', 'd', 'b', 'b/c'},

130

130

            set(tree.all_versioned_paths()))

131

131

        self.assertEqual(

132

 

            [(p, tree.path2id(p)) for p in ['', 'b', 'd',  'b/c']],

 

132

            [(p, tree.path2id(p)) for p in ['', 'b', 'd', 'b/c']],

133

133

            [(path, node.file_id) for path, node in tree.iter_entries_by_dir()])

134

134

        self.assertEqualDiff(b'bar\n', tree.get_file_text('d'))

135

135

        self.assertFalse(tree.is_executable('b/c'))

147

147

            self.assertEqual(['b'], list(tree.unknowns()))

148

148

        # __iter__ has no strongly defined order

149

149

        expected_paths = (

150

 

                ['', 'a'] +

151

 

                (['b'] if tree.has_versioned_directories() else []) +

152

 

                ['e'])

 

150

            ['', 'a']

 

151

            + (['b'] if tree.has_versioned_directories() else [])

 

152

            + ['e'])

153

153

        self.assertEqual(

154

154

            set(expected_paths),

155

155

            set(tree.all_versioned_paths()))

172

172

        if tree.has_versioned_directories() or not tree.has_filename('1top-dir/1dir-in-1topdir'):

173

173

            self.assertEqual([], list(tree.unknowns()))

174

174

        else:

175

 

            self.assertEqual(['1top-dir/1dir-in-1topdir'], list(tree.unknowns()))

 

175

            self.assertEqual(['1top-dir/1dir-in-1topdir'],

 

176

                             list(tree.unknowns()))

176

177

        # __iter__ has no strongly defined order

177

178

        tree_root = tree.path2id('')

178

179

        if tree.has_versioned_directories():

195

196

        else:

196

197

            self.assertEqual(

197

198

                {tree.path2id(p) for p in [

198

 

                    '', '0file', '1top-dir', 

 

199

                    '', '0file', '1top-dir',

199

200

                    '1top-dir/0file-in-1topdir', 'symlink', u'2utf\u1234file']},

200

201

                set(tree.all_file_ids()))

201

202

            # note that the order of the paths and fileids is deliberately

213

214

        # currently this test tree requires unicode. It might be good

214

215

        # to have it simply stop having the single unicode file in it

215

216

        # when dealing with a non-unicode filesystem.

216

 

        tree = self.get_tree_with_subdirs_and_all_supported_content_types(False)

 

217

        tree = self.get_tree_with_subdirs_and_all_supported_content_types(

 

218

            False)

217

219

        tree.lock_read()

218

220

        self.addCleanup(tree.unlock)

219

221

        self.assertEqual([], tree.get_parent_ids())

221

223

        if tree.has_versioned_directories() or not tree.has_filename('1top-dir/1dir-in-1topdir'):

222

224

            self.assertEqual([], list(tree.unknowns()))

223

225

        else:

224

 

            self.assertEqual(['1top-dir/1dir-in-1topdir'], list(tree.unknowns()))

 

226

            self.assertEqual(['1top-dir/1dir-in-1topdir'],

 

227

                             list(tree.unknowns()))

225

228

        # __iter__ has no strongly defined order

226

229

        tree_root = tree.path2id('')

227

230

        if tree.has_versioned_directories():

265

268

                 u'fo\N{Euro Sign}o',

266

269

                 u'ba\N{Euro Sign}r/',

267

270

                 u'ba\N{Euro Sign}r/ba\N{Euro Sign}z',

268

 

                ]

 

271

                 ]

269

272

        # bzr itself does not create unicode file ids, but we want them for

270

273

        # testing.

271

274

        file_ids = [b'TREE_ROOT',

272

275

                    b'fo\xe2\x82\xaco-id',

273

276

                    b'ba\xe2\x82\xacr-id',

274

277

                    b'ba\xe2\x82\xacz-id',

275

 

                   ]

 

278

                    ]

276

279

        self.build_tree(paths[1:])

277

280

        if tree.get_root_id() is None:

278

281

            # Some trees do not have a root yet.

313

316

                        (u'fo\N{Euro Sign}o', foo_id, root_id, revision_id),

314

317

                        (u'ba\N{Euro Sign}r/ba\N{Euro Sign}z',

315

318

                         baz_id, bar_id, revision_id),

316

 

                       ]

 

319

                        ]

317

320

        with tree.lock_read():

318

321

            path_entries = list(tree.iter_entries_by_dir())

319

322

 

320

323

        for expected, (path, ie) in zip(path_and_ids, path_entries):

321

 

            self.assertEqual(expected[0], path) # Paths should match

 

324

            self.assertEqual(expected[0], path)  # Paths should match

322

325

            self.assertIsInstance(path, text_type)

323

326

            self.assertEqual(expected[1], ie.file_id)

324

327

            self.assertIsInstance(ie.file_id, bytes)

357

360

        else:

358

361

            tree2.commit(u'to m\xe9rge')

359

362

 

360

 

        self.assertTrue(tree2.is_versioned(u'ba\N{Euro Sign}r/qu\N{Euro Sign}x'))

 

363

        self.assertTrue(tree2.is_versioned(

 

364

            u'ba\N{Euro Sign}r/qu\N{Euro Sign}x'))

361

365

        wt.merge_from_branch(tree2.branch)

362

366

        self.assertTrue(wt.is_versioned(u'ba\N{Euro Sign}r/qu\N{Euro Sign}x'))

363

367

 

381

385

                         baz_id, bar_id, revision_id_1),

382

386

                        (u'ba\N{Euro Sign}r/qu\N{Euro Sign}x',

383

387

                         qux_id, bar_id, revision_id_2),

384

 

                       ]

 

388

                        ]

385

389

        with tree.lock_read():

386

390

            path_entries = list(tree.iter_entries_by_dir())

387

391

 

388

392

        for (epath, efid, eparent, erev), (path, ie) in zip(path_and_ids,

389

393

                                                            path_entries):

390

 

            self.assertEqual(epath, path) # Paths should match

 

394

            self.assertEqual(epath, path)  # Paths should match

391

395

            self.assertIsInstance(path, text_type)

392

396

            self.assertIsInstance(ie.file_id, bytes)

393

397

            if wt.supports_setting_file_ids():

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0