/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/plugins/upload/tests/test_upload.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-29 20:24:31 UTC
  • mfrom: (6999 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180629202431-2td8kihrsthzuvau
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
220
220
    def _test_create_file(self, file_name):
221
221
        self.make_branch_and_working_tree()
222
222
        self.do_full_upload()
223
 
        self.add_file(file_name, 'foo')
 
223
        self.add_file(file_name, b'foo')
224
224
 
225
225
        self.do_upload()
226
226
 
238
238
        self.do_full_upload()
239
239
        self.add_dir(dir_name)
240
240
        fpath = '%s/%s' % (dir_name, file_name)
241
 
        self.add_file(fpath, 'baz')
 
241
        self.add_file(fpath, b'baz')
242
242
 
243
243
        self.assertUpPathDoesNotExist(fpath)
244
244
 
256
256
 
257
257
    def test_modify_file(self):
258
258
        self.make_branch_and_working_tree()
259
 
        self.add_file('hello', 'foo')
 
259
        self.add_file('hello', b'foo')
260
260
        self.do_full_upload()
261
261
        self.modify_file('hello', 'bar')
262
262
 
268
268
 
269
269
    def _test_rename_one_file(self, old_name, new_name):
270
270
        self.make_branch_and_working_tree()
271
 
        self.add_file(old_name, 'foo')
 
271
        self.add_file(old_name, b'foo')
272
272
        self.do_full_upload()
273
273
        self.rename_any(old_name, new_name)
274
274
 
287
287
 
288
288
    def test_rename_and_change_file(self):
289
289
        self.make_branch_and_working_tree()
290
 
        self.add_file('hello', 'foo')
 
290
        self.add_file('hello', b'foo')
291
291
        self.do_full_upload()
292
292
        self.rename_any('hello', 'goodbye')
293
293
        self.modify_file('goodbye', 'bar')
300
300
 
301
301
    def test_rename_two_files(self):
302
302
        self.make_branch_and_working_tree()
303
 
        self.add_file('a', 'foo')
304
 
        self.add_file('b', 'qux')
 
303
        self.add_file('a', b'foo')
 
304
        self.add_file('b', b'qux')
305
305
        self.do_full_upload()
306
306
        # We rely on the assumption that bzr will topologically sort the
307
307
        # renames which will cause a -> b to appear *before* b -> c
319
319
    def test_upload_revision(self):
320
320
        self.make_branch_and_working_tree() # rev1
321
321
        self.do_full_upload()
322
 
        self.add_file('hello', 'foo') # rev2
323
 
        self.modify_file('hello', 'bar') # rev3
 
322
        self.add_file('hello', b'foo') # rev2
 
323
        self.modify_file('hello', b'bar') # rev3
324
324
 
325
325
        self.assertUpPathDoesNotExist('hello')
326
326
 
331
331
 
332
332
    def test_no_upload_when_changes(self):
333
333
        self.make_branch_and_working_tree()
334
 
        self.add_file('a', 'foo')
335
 
        self.set_file_content('a', 'bar')
 
334
        self.add_file('a', b'foo')
 
335
        self.set_file_content('a', b'bar')
336
336
 
337
337
        self.assertRaises(errors.UncommittedChanges, self.do_upload)
338
338
 
339
339
    def test_no_upload_when_conflicts(self):
340
340
        self.make_branch_and_working_tree()
341
 
        self.add_file('a', 'foo')
 
341
        self.add_file('a', b'foo')
342
342
        self.run_bzr('branch branch other')
343
 
        self.modify_file('a', 'bar')
 
343
        self.modify_file('a', b'bar')
344
344
        other_tree = workingtree.WorkingTree.open('other')
345
 
        self.set_file_content('a', 'baz', 'other/')
 
345
        self.set_file_content('a', 'baz', b'other/')
346
346
        other_tree.commit('modify file a')
347
347
 
348
348
        self.run_bzr('merge -d branch other', retcode=1)
351
351
 
352
352
    def _test_change_file_into_dir(self, file_name):
353
353
        self.make_branch_and_working_tree()
354
 
        self.add_file(file_name, 'foo')
 
354
        self.add_file(file_name, b'foo')
355
355
        self.do_full_upload()
356
356
        self.transform_file_into_dir(file_name)
357
357
        fpath = '%s/%s' % (file_name, 'file')
358
 
        self.add_file(fpath, 'bar')
 
358
        self.add_file(fpath, b'bar')
359
359
 
360
360
        self.assertUpFileEqual('foo', file_name)
361
361
 
373
373
    def test_change_dir_into_file(self):
374
374
        self.make_branch_and_working_tree()
375
375
        self.add_dir('hello')
376
 
        self.add_file('hello/file', 'foo')
 
376
        self.add_file('hello/file', b'foo')
377
377
        self.do_full_upload()
378
378
        self.delete_any('hello/file')
379
379
        self.transform_dir_into_file('hello', 'bar')
386
386
 
387
387
    def _test_make_file_executable(self, file_name):
388
388
        self.make_branch_and_working_tree()
389
 
        self.add_file(file_name, 'foo')
 
389
        self.add_file(file_name, b'foo')
390
390
        self.chmod_file(file_name, 0o664)
391
391
        self.do_full_upload()
392
392
        self.chmod_file(file_name, 0o755)
434
434
        """Test that upload --auto sets the upload_auto option"""
435
435
        self.make_branch_and_working_tree()
436
436
 
437
 
        self.add_file('hello', 'foo')
 
437
        self.add_file('hello', b'foo')
438
438
        self.assertFalse(self.get_upload_auto())
439
439
        self.do_full_upload(auto=True)
440
440
        self.assertUpFileEqual('foo', 'hello')
441
441
        self.assertTrue(self.get_upload_auto())
442
442
 
443
443
        # and check that it stays set until it is unset
444
 
        self.add_file('bye', 'bar')
 
444
        self.add_file('bye', b'bar')
445
445
        self.do_full_upload()
446
446
        self.assertUpFileEqual('bar', 'bye')
447
447
        self.assertTrue(self.get_upload_auto())
450
450
        """Test that upload --no-auto unsets the upload_auto option"""
451
451
        self.make_branch_and_working_tree()
452
452
 
453
 
        self.add_file('hello', 'foo')
 
453
        self.add_file('hello', b'foo')
454
454
        self.do_full_upload(auto=True)
455
455
        self.assertUpFileEqual('foo', 'hello')
456
456
        self.assertTrue(self.get_upload_auto())
457
457
 
458
 
        self.add_file('bye', 'bar')
 
458
        self.add_file('bye', b'bar')
459
459
        self.do_full_upload(auto=False)
460
460
        self.assertUpFileEqual('bar', 'bye')
461
461
        self.assertFalse(self.get_upload_auto())
462
462
 
463
463
        # and check that it stays unset until it is set
464
 
        self.add_file('again', 'baz')
 
464
        self.add_file('again', b'baz')
465
465
        self.do_full_upload()
466
466
        self.assertUpFileEqual('baz', 'again')
467
467
        self.assertFalse(self.get_upload_auto())
476
476
    def test_upload_revid_path_in_dir(self):
477
477
        self.make_branch_and_working_tree()
478
478
        self.add_dir('dir')
479
 
        self.add_file('dir/goodbye', 'baz')
 
479
        self.add_file('dir/goodbye', b'baz')
480
480
 
481
481
        revid_path = 'dir/revid-path'
482
482
        self.tree.branch.get_config_stack(
485
485
 
486
486
        self.do_full_upload()
487
487
 
488
 
        self.add_file('dir/hello', 'foo')
 
488
        self.add_file('dir/hello', b'foo')
489
489
 
490
490
        self.do_upload()
491
491
 
496
496
    def test_ignore_file(self):
497
497
        self.make_branch_and_working_tree()
498
498
        self.do_full_upload()
499
 
        self.add_file('.bzrignore-upload', 'foo')
500
 
        self.add_file('foo', 'bar')
 
499
        self.add_file('.bzrignore-upload', b'foo')
 
500
        self.add_file('foo', b'bar')
501
501
 
502
502
        self.do_upload()
503
503
 
506
506
    def test_ignore_regexp(self):
507
507
        self.make_branch_and_working_tree()
508
508
        self.do_full_upload()
509
 
        self.add_file('.bzrignore-upload', 'f*')
510
 
        self.add_file('foo', 'bar')
 
509
        self.add_file('.bzrignore-upload', b'f*')
 
510
        self.add_file('foo', b'bar')
511
511
 
512
512
        self.do_upload()
513
513
 
516
516
    def test_ignore_directory(self):
517
517
        self.make_branch_and_working_tree()
518
518
        self.do_full_upload()
519
 
        self.add_file('.bzrignore-upload', 'dir')
 
519
        self.add_file('.bzrignore-upload', b'dir')
520
520
        self.add_dir('dir')
521
521
 
522
522
        self.do_upload()
526
526
    def test_ignore_nested_directory(self):
527
527
        self.make_branch_and_working_tree()
528
528
        self.do_full_upload()
529
 
        self.add_file('.bzrignore-upload', 'dir')
 
529
        self.add_file('.bzrignore-upload', b'dir')
530
530
        self.add_dir('dir')
531
531
        self.add_dir('dir/foo')
532
 
        self.add_file('dir/foo/bar', 'bar contents')
 
532
        self.add_file('dir/foo/bar', b'bar contents')
533
533
 
534
534
        self.do_upload()
535
535
 
538
538
 
539
539
    def test_ignore_change_file_into_dir(self):
540
540
        self.make_branch_and_working_tree()
541
 
        self.add_file('hello', 'foo')
 
541
        self.add_file('hello', b'foo')
542
542
        self.do_full_upload()
543
 
        self.add_file('.bzrignore-upload', 'hello')
 
543
        self.add_file('.bzrignore-upload', b'hello')
544
544
        self.transform_file_into_dir('hello')
545
 
        self.add_file('hello/file', 'bar')
 
545
        self.add_file('hello/file', b'bar')
546
546
 
547
547
        self.assertUpFileEqual('foo', 'hello')
548
548
 
553
553
    def test_ignore_change_dir_into_file(self):
554
554
        self.make_branch_and_working_tree()
555
555
        self.add_dir('hello')
556
 
        self.add_file('hello/file', 'foo')
 
556
        self.add_file('hello/file', b'foo')
557
557
        self.do_full_upload()
558
558
 
559
 
        self.add_file('.bzrignore-upload', 'hello')
 
559
        self.add_file('.bzrignore-upload', b'hello')
560
560
        self.delete_any('hello/file')
561
561
        self.transform_dir_into_file('hello', 'bar')
562
562
 
570
570
        self.make_branch_and_working_tree()
571
571
        self.add_dir('dir')
572
572
        self.add_dir('dir/subdir')
573
 
        self.add_file('dir/subdir/a', 'foo')
 
573
        self.add_file('dir/subdir/a', b'foo')
574
574
        self.do_full_upload()
575
 
        self.add_file('.bzrignore-upload', 'dir/subdir')
 
575
        self.add_file('.bzrignore-upload', b'dir/subdir')
576
576
        self.rename_any('dir/subdir/a', 'dir/a')
577
577
        self.delete_any('dir/subdir')
578
578
 
611
611
        self.make_branch_and_working_tree()
612
612
        self.add_dir('dir')
613
613
        self.do_full_upload()
614
 
        self.add_file('dir/goodbye', 'baz')
 
614
        self.add_file('dir/goodbye', b'baz')
615
615
 
616
616
        self.assertUpPathDoesNotExist('dir/goodbye')
617
617
 
629
629
 
630
630
    def test_delete_one_file(self):
631
631
        self.make_branch_and_working_tree()
632
 
        self.add_file('hello', 'foo')
 
632
        self.add_file('hello', b'foo')
633
633
        self.do_full_upload()
634
634
        self.delete_any('hello')
635
635
 
643
643
        self.make_branch_and_working_tree()
644
644
        self.add_dir('dir')
645
645
        self.add_dir('dir/subdir')
646
 
        self.add_file('dir/subdir/a', 'foo')
 
646
        self.add_file('dir/subdir/a', b'foo')
647
647
        self.do_full_upload()
648
648
        self.rename_any('dir/subdir/a', 'a')
649
649
        self.delete_any('dir/subdir')
660
660
 
661
661
    def test_delete_one_file_rename_to_deleted(self):
662
662
        self.make_branch_and_working_tree()
663
 
        self.add_file('a', 'foo')
664
 
        self.add_file('b', 'bar')
 
663
        self.add_file('a', b'foo')
 
664
        self.add_file('b', b'bar')
665
665
        self.do_full_upload()
666
666
        self.delete_any('a')
667
667
        self.rename_any('b', 'a')
676
676
    def test_rename_outside_dir_delete_dir(self):
677
677
        self.make_branch_and_working_tree()
678
678
        self.add_dir('dir')
679
 
        self.add_file('dir/a', 'foo')
 
679
        self.add_file('dir/a', b'foo')
680
680
        self.do_full_upload()
681
681
        self.rename_any('dir/a', 'a')
682
682
        self.delete_any('dir')
701
701
 
702
702
    def test_upload_for_the_first_time_do_a_full_upload(self):
703
703
        self.make_branch_and_working_tree()
704
 
        self.add_file('hello', 'bar')
 
704
        self.add_file('hello', b'bar')
705
705
 
706
706
        revid_path = self.tree.branch.get_config_stack(
707
707
            ).get('upload_revid_location')
713
713
 
714
714
    def test_ignore_delete_one_file(self):
715
715
        self.make_branch_and_working_tree()
716
 
        self.add_file('hello', 'foo')
 
716
        self.add_file('hello', b'foo')
717
717
        self.do_full_upload()
718
 
        self.add_file('.bzrignore-upload', 'hello')
 
718
        self.add_file('.bzrignore-upload', b'hello')
719
719
        self.delete_any('hello')
720
720
 
721
721
        self.assertUpFileEqual('foo', 'hello')
773
773
        working tree.
774
774
        """
775
775
        self.make_branch_and_working_tree()
776
 
        self.add_file('hello', 'foo')
 
776
        self.add_file('hello', b'foo')
777
777
 
778
778
        remote_branch_url = self.get_url(self.remote_branch_dir)
779
779
        self.run_bzr(['push', remote_branch_url,
836
836
        t = self.get_transport(self.upload_dir)
837
837
        t.put_bytes('.bzr-upload.revid', 'fake')
838
838
        # Make a change
839
 
        self.add_file('foo', 'bar\n')
 
839
        self.add_file('foo', b'bar\n')
840
840
        self.assertRaises(cmds.DivergedUploadedTree, self.do_full_upload)
841
841