← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

Merge from test-tweaks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
332
332
        tree.commit('revision 1')
333
333
        dir = tree.bzrdir
334
334
        target = dir.clone(self.get_url('target'))
 
335
        try:
 
336
            target.open_workingtree()
 
337
        except (errors.NotLocalUrl, errors.NoWorkingTree):
 
338
            raise TestSkipped("clone cannot make working tree with transport %r"
 
339
                              % target.transport)
335
340
        self.assertNotEqual(dir.transport.base, target.transport.base)
336
341
        self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
337
342
                                    ['./.bzr/stat-cache',
378
383
        except errors.IncompatibleFormat:
379
384
            # this is ok too, not all formats have to support references.
380
385
            return
381
 
        dir.create_workingtree()
 
386
        try:
 
387
            dir.create_workingtree()
 
388
        except errors.NotLocalUrl:
 
389
            raise TestSkipped("cannot make working tree with transport %r"
 
390
                              % dir.transport)
382
391
        target = dir.clone(self.get_url('target'))
 
392
        try:
 
393
            target.open_workingtree()
 
394
        except (errors.NotLocalUrl, errors.NoWorkingTree):
 
395
            raise TestSkipped("clone cannot make working tree with transport %r"
 
396
                              % target.transport)
383
397
        self.assertNotEqual(dir.transport.base, target.transport.base)
384
398
        self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
385
399
                                    ['./.bzr/stat-cache',
401
415
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
402
416
        dir = tree.bzrdir
403
417
        target = dir.clone(self.get_url('target'), revision_id='1')
 
418
        try:
 
419
            target.open_workingtree()
 
420
        except (errors.NotLocalUrl, errors.NoWorkingTree):
 
421
            raise TestSkipped("clone cannot make working tree with transport %r"
 
422
                              % target.transport)
404
423
        self.assertEqual('1', target.open_workingtree().last_revision())
405
424
 
406
425
    def test_clone_bzrdir_incomplete_source_with_basis(self):