← Back to branch summary

~jelmer/brz/bundle-webdav

« back to all changes in this revision

Viewing changes to breezy/tests/test_switch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-13 00:34:53 UTC
  • mfrom: (7027.3.8 python3-n)
  • Revision ID: breezy.the.bot@gmail.com-20180713003453-3wofrh7brng5jz3l
Add some more bees; support writing both bytes and unicode strings in build_tree_contents.

Merged from https://code.launchpad.net/~jelmer/brz/python3-n/+merge/349091

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_switch.py
181
181
        checkout = tree.branch.create_checkout('checkout',
182
182
            lightweight=self.lightweight)
183
183
        switch.switch(checkout.controldir, tree2.branch)
184
 
        self.assertEqual('custom-root-id', tree2.get_root_id())
 
184
        self.assertEqual(b'custom-root-id', tree2.get_root_id())
185
185
 
186
186
    def test_switch_configurable_file_merger(self):
187
187
        class DummyMerger(_mod_merge.ConfigurableFileMerger):