/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: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
63
63
    # one for each transport implementation
64
64
    t_tests, remaining_tests = tests.split_suite_by_condition(
65
65
        standard_tests, tests.condition_isinstance((
66
 
                TestFullUpload,
67
 
                TestIncrementalUpload,
68
 
                TestUploadFromRemoteBranch,
69
 
                )))
 
66
            TestFullUpload,
 
67
            TestIncrementalUpload,
 
68
            TestUploadFromRemoteBranch,
 
69
            )))
70
70
    tests.multiply_tests(t_tests, get_transport_scenarios(), result)
71
71
 
72
72
    # one for each branch format
73
73
    b_tests, remaining_tests = tests.split_suite_by_condition(
74
74
        remaining_tests, tests.condition_isinstance((
75
 
                TestBranchUploadLocations,
76
 
                )))
 
75
            TestBranchUploadLocations,
 
76
            )))
77
77
    tests.multiply_tests(b_tests, per_branch.branch_scenarios(),
78
78
                         result)
79
79
 
319
319
        self.assertUpFileEqual(b'qux', 'c')
320
320
 
321
321
    def test_upload_revision(self):
322
 
        self.make_branch_and_working_tree() # rev1
 
322
        self.make_branch_and_working_tree()  # rev1
323
323
        self.do_full_upload()
324
 
        self.add_file('hello', b'foo') # rev2
325
 
        self.modify_file('hello', b'bar') # rev3
 
324
        self.add_file('hello', b'foo')  # rev2
 
325
        self.modify_file('hello', b'bar')  # rev3
326
326
 
327
327
        self.assertUpPathDoesNotExist('hello')
328
328
 
840
840
        # Make a change
841
841
        self.add_file('foo', b'bar\n')
842
842
        self.assertRaises(cmds.DivergedUploadedTree, self.do_full_upload)
843