/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_script.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-02 20:37:44 UTC
  • mfrom: (7025 work)
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180702203744-3i0bimk0r5pfzjzl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_script.py
317
317
        self.build_tree_contents([('file', b'content\n')])
318
318
        retcode, out, err = self.run_command(['cat', 'file'],
319
319
                                             None, 'content\n', None)
320
 
        self.assertEqual('content\n', out)
 
320
        self.assertEqual(b'content\n', out)
321
321
        self.assertEqual(None, err)
322
322
 
323
323
    def test_cat_input_to_file(self):
324
324
        retcode, out, err = self.run_command(['cat', '>file'],
325
325
                                             'content\n', None, None)
326
 
        self.assertFileEqual('content\n', 'file')
 
326
        self.assertFileEqual(b'content\n', 'file')
327
327
        self.assertEqual(None, out)
328
328
        self.assertEqual(None, err)
329
329
        retcode, out, err = self.run_command(['cat', '>>file'],
330
330
                                             'more\n', None, None)
331
 
        self.assertFileEqual('content\nmore\n', 'file')
 
331
        self.assertFileEqual(b'content\nmore\n', 'file')
332
332
        self.assertEqual(None, out)
333
333
        self.assertEqual(None, err)
334
334
 
336
336
        self.build_tree_contents([('file', b'content\n')])
337
337
        retcode, out, err = self.run_command(['cat', 'file', '>file2'],
338
338
                                             None, None, None)
339
 
        self.assertFileEqual('content\n', 'file2')
 
339
        self.assertFileEqual(b'content\n', 'file2')
340
340
 
341
341
    def test_cat_files_to_file(self):
342
342
        self.build_tree_contents([('cat', b'cat\n')])
343
343
        self.build_tree_contents([('dog', b'dog\n')])
344
344
        retcode, out, err = self.run_command(['cat', 'cat', 'dog', '>file'],
345
345
                                             None, None, None)
346
 
        self.assertFileEqual('cat\ndog\n', 'file')
 
346
        self.assertFileEqual(b'cat\ndog\n', 'file')
347
347
 
348
348
    def test_cat_bogus_input_file(self):
349
349
        self.run_script("""
456
456
                                             None, None, None)
457
457
        self.assertEqual(None, out)
458
458
        self.assertEqual(None, err)
459
 
        self.assertFileEqual('hello\n', 'file')
 
459
        self.assertFileEqual(b'hello\n', 'file')
460
460
        retcode, out, err = self.run_command(['echo', 'happy', '>>file'],
461
461
                                             None, None, None)
462
462
        self.assertEqual(None, out)
463
463
        self.assertEqual(None, err)
464
 
        self.assertFileEqual('hello\nhappy\n', 'file')
 
464
        self.assertFileEqual(b'hello\nhappy\n', 'file')
465
465
 
466
466
    def test_empty_line_in_output_is_respected(self):
467
467
        self.run_script("""