/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-15 22:53:27 UTC
  • mfrom: (7337 work)
  • mto: This revision was merged to the branch mainline in revision 7347.
  • Revision ID: jelmer@jelmer.uk-20190615225327-g77kw1v105svs31i
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
2838
2838
        self.addCleanup(preview.finalize)
2839
2839
        preview.delete_versioned(preview.trans_id_tree_path('foo'))
2840
2840
        preview_tree = preview.get_preview_tree()
2841
 
        out = StringIO()
 
2841
        out = BytesIO()
2842
2842
        log = BytesIO()
2843
2843
        trace.push_log_file(log)
2844
2844
        os_symlink = getattr(os, 'symlink', None)
2847
2847
            show_diff_trees(revision_tree, preview_tree, out)
2848
2848
            lines = out.getvalue().splitlines()
2849
2849
        finally:
2850
 
            if os_symlink:
2851
 
                os.symlink = os_symlink
 
2850
            os.symlink = os_symlink
2852
2851
        self.assertContainsRe(
2853
2852
            log.getvalue(),
2854
2853
            b'Ignoring "foo" as symlinks are not supported on this filesystem')