96
96
is_testing_for_transports = tests.condition_isinstance(
98
TestIncrementalUpload,))
98
TestIncrementalUpload,
99
TestFullUploadFromRemote,
100
TestIncrementalUploadFromRemote))
99
101
transport_adapter = TransportAdapter()
101
103
is_testing_for_branches = tests.condition_isinstance(
557
560
self.assertUpFileEqual('bar', 'hello')
562
class TestUploadFromRemote(TestUploadMixin):
564
def do_full_upload(self, *args, **kwargs):
565
up_url = self.get_transport(self.upload_dir).external_url()
567
self.run_bzr(['push', up_url, '--directory=branch'])
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)
576
def do_incremental_upload(self, *args, **kwargs):
577
up_url = self.get_transport(self.upload_dir).external_url()
579
self.run_bzr(['push', up_url, '--directory=branch'])
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)
587
class TestFullUploadFromRemote(tests.TestCaseWithTransport, TestUploadFromRemote):
589
do_upload = TestUploadFromRemote.do_full_upload
591
class TestIncrementalUploadFromRemote(tests.TestCaseWithTransport, TestUploadFromRemote):
593
do_upload = TestUploadFromRemote.do_incremental_upload
560
596
class TestBranchUploadLocations(branch_implementations.TestCaseWithBranch):