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

  • Committer: Gary van der Merwe
  • Date: 2009-01-04 08:38:06 UTC
  • mto: (0.152.55 trunk)
  • mto: This revision was merged to the branch mainline in revision 6649.
  • Revision ID: garyvdm@gmail.com-20090104083806-nzpdt5m5rgx2j5op
Add test for upload from remote. Not working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
95
95
 
96
96
    is_testing_for_transports = tests.condition_isinstance(
97
97
        (TestFullUpload,
98
 
         TestIncrementalUpload,))
 
98
         TestIncrementalUpload,
 
99
         TestFullUploadFromRemote,
 
100
         TestIncrementalUploadFromRemote))
99
101
    transport_adapter = TransportAdapter()
100
102
 
101
103
    is_testing_for_branches = tests.condition_isinstance(
149
151
 
150
152
    upload_dir = 'upload/'
151
153
    branch_dir = 'branch/'
 
154
    
152
155
 
153
156
    def make_local_branch(self):
154
157
        t = transport.get_transport('branch')
556
559
 
557
560
        self.assertUpFileEqual('bar', 'hello')
558
561
 
 
562
class TestUploadFromRemote(TestUploadMixin):
 
563
    
 
564
    def do_full_upload(self, *args, **kwargs):
 
565
        up_url = self.get_transport(self.upload_dir).external_url()
 
566
        
 
567
        self.run_bzr(['push', up_url, '--directory=branch'])
 
568
        
 
569
        upload = self._get_cmd_upload()
 
570
        if kwargs.get('directory', None) is None:
 
571
            kwargs['directory'] = up_url
 
572
        kwargs['full'] = True
 
573
        kwargs['quiet'] = True
 
574
        upload.run(up_url, *args, **kwargs)
 
575
 
 
576
    def do_incremental_upload(self, *args, **kwargs):
 
577
        up_url = self.get_transport(self.upload_dir).external_url()
 
578
        
 
579
        self.run_bzr(['push', up_url, '--directory=branch'])
 
580
        
 
581
        upload = self._get_cmd_upload()
 
582
        if kwargs.get('directory', None) is None:
 
583
            kwargs['directory'] = up_url
 
584
        kwargs['quiet'] = True
 
585
        upload.run(up_url, *args, **kwargs)
 
586
 
 
587
class TestFullUploadFromRemote(tests.TestCaseWithTransport, TestUploadFromRemote):
 
588
    
 
589
    do_upload = TestUploadFromRemote.do_full_upload
 
590
 
 
591
class TestIncrementalUploadFromRemote(tests.TestCaseWithTransport, TestUploadFromRemote):
 
592
    
 
593
    do_upload = TestUploadFromRemote.do_incremental_upload
 
594
    
559
595
 
560
596
class TestBranchUploadLocations(branch_implementations.TestCaseWithBranch):
561
597