/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-17 11:15:04 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 7003.
  • Revision ID: jelmer@jelmer.uk-20180617111504-i2eqvqbtfj5bp0t3
s/file/open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
224
224
 
225
225
        self.do_upload()
226
226
 
227
 
        self.assertUpFileEqual('foo', file_name)
 
227
        self.assertUpFileEqual(b'foo', file_name)
228
228
 
229
229
    def test_create_file(self):
230
230
        self._test_create_file('hello')
244
244
 
245
245
        self.do_upload()
246
246
 
247
 
        self.assertUpFileEqual('baz', fpath)
 
247
        self.assertUpFileEqual(b'baz', fpath)
248
248
        self.assertUpPathModeEqual(dir_name, 0o775)
249
249
 
250
250
    def test_create_file_in_dir(self):
258
258
        self.make_branch_and_working_tree()
259
259
        self.add_file('hello', b'foo')
260
260
        self.do_full_upload()
261
 
        self.modify_file('hello', 'bar')
 
261
        self.modify_file('hello', b'bar')
262
262
 
263
 
        self.assertUpFileEqual('foo', 'hello')
 
263
        self.assertUpFileEqual(b'foo', 'hello')
264
264
 
265
265
        self.do_upload()
266
266
 
267
 
        self.assertUpFileEqual('bar', 'hello')
 
267
        self.assertUpFileEqual(b'bar', 'hello')
268
268
 
269
269
    def _test_rename_one_file(self, old_name, new_name):
270
270
        self.make_branch_and_working_tree()
272
272
        self.do_full_upload()
273
273
        self.rename_any(old_name, new_name)
274
274
 
275
 
        self.assertUpFileEqual('foo', old_name)
 
275
        self.assertUpFileEqual(b'foo', old_name)
276
276
 
277
277
        self.do_upload()
278
278
 
279
 
        self.assertUpFileEqual('foo', new_name)
 
279
        self.assertUpFileEqual(b'foo', new_name)
280
280
 
281
281
    def test_rename_one_file(self):
282
282
        self._test_rename_one_file('hello', 'goodbye')
290
290
        self.add_file('hello', b'foo')
291
291
        self.do_full_upload()
292
292
        self.rename_any('hello', 'goodbye')
293
 
        self.modify_file('goodbye', 'bar')
 
293
        self.modify_file('goodbye', b'bar')
294
294
 
295
 
        self.assertUpFileEqual('foo', 'hello')
 
295
        self.assertUpFileEqual(b'foo', 'hello')
296
296
 
297
297
        self.do_upload()
298
298
 
299
 
        self.assertUpFileEqual('bar', 'goodbye')
 
299
        self.assertUpFileEqual(b'bar', 'goodbye')
300
300
 
301
301
    def test_rename_two_files(self):
302
302
        self.make_branch_and_working_tree()
308
308
        self.rename_any('b', 'c')
309
309
        self.rename_any('a', 'b')
310
310
 
311
 
        self.assertUpFileEqual('foo', 'a')
312
 
        self.assertUpFileEqual('qux', 'b')
 
311
        self.assertUpFileEqual(b'foo', 'a')
 
312
        self.assertUpFileEqual(b'qux', 'b')
313
313
 
314
314
        self.do_upload()
315
315
 
316
 
        self.assertUpFileEqual('foo', 'b')
317
 
        self.assertUpFileEqual('qux', 'c')
 
316
        self.assertUpFileEqual(b'foo', 'b')
 
317
        self.assertUpFileEqual(b'qux', 'c')
318
318
 
319
319
    def test_upload_revision(self):
320
320
        self.make_branch_and_working_tree() # rev1
327
327
        revspec = revisionspec.RevisionSpec.from_string('2')
328
328
        self.do_upload(revision=[revspec])
329
329
 
330
 
        self.assertUpFileEqual('foo', 'hello')
 
330
        self.assertUpFileEqual(b'foo', 'hello')
331
331
 
332
332
    def test_no_upload_when_changes(self):
333
333
        self.make_branch_and_working_tree()
357
357
        fpath = '%s/%s' % (file_name, 'file')
358
358
        self.add_file(fpath, b'bar')
359
359
 
360
 
        self.assertUpFileEqual('foo', file_name)
 
360
        self.assertUpFileEqual(b'foo', file_name)
361
361
 
362
362
        self.do_upload()
363
363
 
364
 
        self.assertUpFileEqual('bar', fpath)
 
364
        self.assertUpFileEqual(b'bar', fpath)
365
365
 
366
366
    def test_change_file_into_dir(self):
367
367
        self._test_change_file_into_dir('hello')
378
378
        self.delete_any('hello/file')
379
379
        self.transform_dir_into_file('hello', 'bar')
380
380
 
381
 
        self.assertUpFileEqual('foo', 'hello/file')
 
381
        self.assertUpFileEqual(b'foo', 'hello/file')
382
382
 
383
383
        self.do_upload()
384
384
 
385
 
        self.assertUpFileEqual('bar', 'hello')
 
385
        self.assertUpFileEqual(b'bar', 'hello')
386
386
 
387
387
    def _test_make_file_executable(self, file_name):
388
388
        self.make_branch_and_working_tree()
437
437
        self.add_file('hello', b'foo')
438
438
        self.assertFalse(self.get_upload_auto())
439
439
        self.do_full_upload(auto=True)
440
 
        self.assertUpFileEqual('foo', 'hello')
 
440
        self.assertUpFileEqual(b'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
444
        self.add_file('bye', b'bar')
445
445
        self.do_full_upload()
446
 
        self.assertUpFileEqual('bar', 'bye')
 
446
        self.assertUpFileEqual(b'bar', 'bye')
447
447
        self.assertTrue(self.get_upload_auto())
448
448
 
449
449
    def test_upload_noauto(self):
452
452
 
453
453
        self.add_file('hello', b'foo')
454
454
        self.do_full_upload(auto=True)
455
 
        self.assertUpFileEqual('foo', 'hello')
 
455
        self.assertUpFileEqual(b'foo', 'hello')
456
456
        self.assertTrue(self.get_upload_auto())
457
457
 
458
458
        self.add_file('bye', b'bar')
459
459
        self.do_full_upload(auto=False)
460
 
        self.assertUpFileEqual('bar', 'bye')
 
460
        self.assertUpFileEqual(b'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
464
        self.add_file('again', b'baz')
465
465
        self.do_full_upload()
466
 
        self.assertUpFileEqual('baz', 'again')
 
466
        self.assertUpFileEqual(b'baz', 'again')
467
467
        self.assertFalse(self.get_upload_auto())
468
468
 
469
469
    def test_upload_from_subdir(self):
490
490
        self.do_upload()
491
491
 
492
492
        self.assertUpPathExists(revid_path)
493
 
        self.assertUpFileEqual('baz', 'dir/goodbye')
494
 
        self.assertUpFileEqual('foo', 'dir/hello')
 
493
        self.assertUpFileEqual(b'baz', 'dir/goodbye')
 
494
        self.assertUpFileEqual(b'foo', 'dir/hello')
495
495
 
496
496
    def test_ignore_file(self):
497
497
        self.make_branch_and_working_tree()
544
544
        self.transform_file_into_dir('hello')
545
545
        self.add_file('hello/file', b'bar')
546
546
 
547
 
        self.assertUpFileEqual('foo', 'hello')
 
547
        self.assertUpFileEqual(b'foo', 'hello')
548
548
 
549
549
        self.do_upload()
550
550
 
551
 
        self.assertUpFileEqual('foo', 'hello')
 
551
        self.assertUpFileEqual(b'foo', 'hello')
552
552
 
553
553
    def test_ignore_change_dir_into_file(self):
554
554
        self.make_branch_and_working_tree()
560
560
        self.delete_any('hello/file')
561
561
        self.transform_dir_into_file('hello', 'bar')
562
562
 
563
 
        self.assertUpFileEqual('foo', 'hello/file')
 
563
        self.assertUpFileEqual(b'foo', 'hello/file')
564
564
 
565
565
        self.do_upload()
566
566
 
567
 
        self.assertUpFileEqual('foo', 'hello/file')
 
567
        self.assertUpFileEqual(b'foo', 'hello/file')
568
568
 
569
569
    def test_ignore_delete_dir_in_subdir(self):
570
570
        self.make_branch_and_working_tree()
576
576
        self.rename_any('dir/subdir/a', 'dir/a')
577
577
        self.delete_any('dir/subdir')
578
578
 
579
 
        self.assertUpFileEqual('foo', 'dir/subdir/a')
 
579
        self.assertUpFileEqual(b'foo', 'dir/subdir/a')
580
580
 
581
581
        self.do_upload()
582
582
 
583
583
        # The file in the dir is not ignored. This a bit contrived but
584
584
        # indicates that we may encounter problems when ignored items appear
585
585
        # and disappear... -- vila 100106
586
 
        self.assertUpFileEqual('foo', 'dir/a')
 
586
        self.assertUpFileEqual(b'foo', 'dir/a')
587
587
 
588
588
 
589
589
class TestFullUpload(tests.TestCaseWithTransport, TestUploadMixin):
617
617
 
618
618
        self.do_full_upload()
619
619
 
620
 
        self.assertUpFileEqual('baz', 'dir/goodbye')
 
620
        self.assertUpFileEqual(b'baz', 'dir/goodbye')
621
621
        self.assertUpPathModeEqual('dir', 0o775)
622
622
 
623
623
 
633
633
        self.do_full_upload()
634
634
        self.delete_any('hello')
635
635
 
636
 
        self.assertUpFileEqual('foo', 'hello')
 
636
        self.assertUpFileEqual(b'foo', 'hello')
637
637
 
638
638
        self.do_upload()
639
639
 
649
649
        self.delete_any('dir/subdir')
650
650
        self.delete_any('dir')
651
651
 
652
 
        self.assertUpFileEqual('foo', 'dir/subdir/a')
 
652
        self.assertUpFileEqual(b'foo', 'dir/subdir/a')
653
653
 
654
654
        self.do_upload()
655
655
 
656
656
        self.assertUpPathDoesNotExist('dir/subdir/a')
657
657
        self.assertUpPathDoesNotExist('dir/subdir')
658
658
        self.assertUpPathDoesNotExist('dir')
659
 
        self.assertUpFileEqual('foo', 'a')
 
659
        self.assertUpFileEqual(b'foo', 'a')
660
660
 
661
661
    def test_delete_one_file_rename_to_deleted(self):
662
662
        self.make_branch_and_working_tree()
666
666
        self.delete_any('a')
667
667
        self.rename_any('b', 'a')
668
668
 
669
 
        self.assertUpFileEqual('foo', 'a')
 
669
        self.assertUpFileEqual(b'foo', 'a')
670
670
 
671
671
        self.do_upload()
672
672
 
673
673
        self.assertUpPathDoesNotExist('b')
674
 
        self.assertUpFileEqual('bar', 'a')
 
674
        self.assertUpFileEqual(b'bar', 'a')
675
675
 
676
676
    def test_rename_outside_dir_delete_dir(self):
677
677
        self.make_branch_and_working_tree()
681
681
        self.rename_any('dir/a', 'a')
682
682
        self.delete_any('dir')
683
683
 
684
 
        self.assertUpFileEqual('foo', 'dir/a')
 
684
        self.assertUpFileEqual(b'foo', 'dir/a')
685
685
 
686
686
        self.do_upload()
687
687
 
688
688
        self.assertUpPathDoesNotExist('dir/a')
689
689
        self.assertUpPathDoesNotExist('dir')
690
 
        self.assertUpFileEqual('foo', 'a')
 
690
        self.assertUpFileEqual(b'foo', 'a')
691
691
 
692
692
    def test_delete_symlink(self):
693
693
        self.make_branch_and_working_tree()
709
709
 
710
710
        self.do_upload()
711
711
 
712
 
        self.assertUpFileEqual('bar', 'hello')
 
712
        self.assertUpFileEqual(b'bar', 'hello')
713
713
 
714
714
    def test_ignore_delete_one_file(self):
715
715
        self.make_branch_and_working_tree()
718
718
        self.add_file('.bzrignore-upload', b'hello')
719
719
        self.delete_any('hello')
720
720
 
721
 
        self.assertUpFileEqual('foo', 'hello')
 
721
        self.assertUpFileEqual(b'foo', 'hello')
722
722
 
723
723
        self.do_upload()
724
724
 
725
 
        self.assertUpFileEqual('foo', 'hello')
 
725
        self.assertUpFileEqual(b'foo', 'hello')
726
726
 
727
727
 
728
728
class TestBranchUploadLocations(per_branch.TestCaseWithBranch):
790
790
 
791
791
    def test_upload_without_working_tree(self):
792
792
        self.do_full_upload(directory=self.remote_branch_url)
793
 
        self.assertUpFileEqual('foo', 'hello')
 
793
        self.assertUpFileEqual(b'foo', 'hello')
794
794
 
795
795
 
796
796
class TestUploadDiverged(tests.TestCaseWithTransport, UploadUtilsMixin):