/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

Add a test to cover bug #600628 and cleanup some

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_upload.py
808
808
        self.assertUpFileEqual('foo', 'hello')
809
809
 
810
810
 
811
 
class TestUploadDiverged(tests.TestCaseWithTransport,
812
 
                         UploadUtilsMixin):
 
811
class TestUploadDiverged(tests.TestCaseWithTransport, UploadUtilsMixin):
813
812
 
814
813
    def setUp(self):
815
814
        super(TestUploadDiverged, self).setUp()
841
840
        self.do_incremental_upload(directory=self.diverged_tree.basedir,
842
841
                                   overwrite=True)
843
842
        self.assertRevidUploaded('rev2b')
 
843
 
 
844
 
 
845
class TestUploadBadRemoteReivd(tests.TestCaseWithTransport, UploadUtilsMixin):
 
846
 
 
847
    def test_raises_on_wrong_revid(self):
 
848
        tree = self.make_branch_and_working_tree()
 
849
        self.do_full_upload()
 
850
        # Put a fake revid on the remote branch
 
851
        t = self.get_transport(self.upload_dir)
 
852
        t.put_bytes('.bzr-upload.revid', 'fake')
 
853
        # Make a change
 
854
        self.add_file('foo', 'bar\n')
 
855
        self.assertRaises(upload.DivergedUploadedTree, self.do_full_upload)
 
856