/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/blackbox/test_export.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_export.py
78
78
 
79
79
    def make_tree_with_extra_bzr_files(self):
80
80
        tree = self.make_basic_tree()
81
 
        self.build_tree_contents([('tree/.bzrrules', '')])
 
81
        self.build_tree_contents([('tree/.bzrrules', b'')])
82
82
        self.build_tree(['tree/.bzr-adir/', 'tree/.bzr-adir/afile'])
83
83
        tree.add(['.bzrrules', '.bzr-adir/', '.bzr-adir/afile'])
84
84
 
244
244
        tree = self.make_branch_and_tree('dir')
245
245
        self.build_tree(['dir/a'])
246
246
        tree.add('a')
247
 
        self.build_tree_contents([('dir/.bzrrules', '')])
 
247
        self.build_tree_contents([('dir/.bzrrules', b'')])
248
248
        tree.add('.bzrrules')
249
249
        self.build_tree(['dir/.bzr-adir/', 'dir/.bzr-adir/afile'])
250
250
        tree.add(['.bzr-adir/', '.bzr-adir/afile'])
267
267
    def example_branch(self):
268
268
        """Create a branch a 'branch' containing hello and goodbye."""
269
269
        tree = self.make_branch_and_tree('branch')
270
 
        self.build_tree_contents([('branch/hello', 'foo')])
 
270
        self.build_tree_contents([('branch/hello', b'foo')])
271
271
        tree.add('hello')
272
272
        tree.commit('setup')
273
273
 
274
 
        self.build_tree_contents([('branch/goodbye', 'baz')])
 
274
        self.build_tree_contents([('branch/goodbye', b'baz')])
275
275
        tree.add('goodbye')
276
276
        tree.commit('setup')
277
277
        return tree
380
380
 
381
381
    def test_dir_export_per_file_timestamps(self):
382
382
        tree = self.example_branch()
383
 
        self.build_tree_contents([('branch/har', 'foo')])
 
383
        self.build_tree_contents([('branch/har', b'foo')])
384
384
        tree.add('har')
385
385
        # Earliest allowable date on FAT32 filesystems is 1980-01-01
386
386
        tree.commit('setup', timestamp=315532800)
409
409
        """Test --uncommitted option"""
410
410
        self.example_branch()
411
411
        os.chdir('branch')
412
 
        self.build_tree_contents([('goodbye', 'uncommitted data')])
 
412
        self.build_tree_contents([('goodbye', b'uncommitted data')])
413
413
        self.run_bzr(['export', '--uncommitted', 'latest'])
414
414
        self.check_file_contents('latest/goodbye', 'uncommitted data')
415
415
 
424
424
 
425
425
    def test_zip_export_per_file_timestamps(self):
426
426
        tree = self.example_branch()
427
 
        self.build_tree_contents([('branch/har', 'foo')])
 
427
        self.build_tree_contents([('branch/har', b'foo')])
428
428
        tree.add('har')
429
429
        # Earliest allowable date on FAT32 filesystems is 1980-01-01
430
430
        timestamp = 347151600
440
440
    def test_simple_export(self):
441
441
        self.setup_smart_server_with_call_log()
442
442
        t = self.make_branch_and_tree('branch')
443
 
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
443
        self.build_tree_contents([('branch/foo', b'thecontents')])
444
444
        t.add("foo")
445
445
        t.commit("message")
446
446
        self.reset_smart_call_log()