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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_repository_reference/test_fetch.py
32
32
        content = [b'content lines\n'
33
33
                   b'for the first revision\n'
34
34
                   b'which is a marginal amount of content\n'
35
 
                  ]
 
35
                   ]
36
36
        builder.start_series()
37
37
        builder.build_snapshot(None, [
38
38
            ('add', ('', b'root-id', 'directory', None)),
72
72
        final_b.lock_read()
73
73
        self.addCleanup(final_b.unlock)
74
74
        self.assertEqual(b'C-id', final_b.last_revision())
75
 
        text_keys = [(b'a-id', b'A-id'), (b'a-id', b'B-id'), (b'a-id', b'C-id')]
 
75
        text_keys = [(b'a-id', b'A-id'), (b'a-id', b'B-id'),
 
76
                     (b'a-id', b'C-id')]
76
77
        stream = final_b.repository.texts.get_record_stream(text_keys,
77
 
            'unordered', True)
 
78
                                                            'unordered', True)
78
79
        records = sorted([(r.key, r.get_bytes_as('fulltext')) for r in stream])
79
80
        self.assertEqual([
80
81
            ((b'a-id', b'A-id'), b''.join(content[:-2])),
87
88
        transport = self.make_smart_server('server')
88
89
        transport.ensure_base()
89
90
        url = transport.abspath('')
90
 
        stack_b = source_b.controldir.sprout(url + '/stack-on', revision_id=b'B-id')
 
91
        stack_b = source_b.controldir.sprout(
 
92
            url + '/stack-on', revision_id=b'B-id')
91
93
        # self.make_branch only takes relative paths, so we do it the 'hard'
92
94
        # way
93
95
        target_transport = transport.clone('target')
94
96
        target_transport.ensure_base()
95
97
        target_bzrdir = self.bzrdir_format.initialize_on_transport(
96
 
                            target_transport)
 
98
            target_transport)
97
99
        target_bzrdir.create_repository()
98
100
        target_b = target_bzrdir.create_branch()
99
101
        target_b.set_stacked_on_url('../stack-on')
107
109
        # revision_id versus not. If you supply revision_id, then you get a
108
110
        # PendingAncestryResult for the search, versus a SearchResult...
109
111
        final2_b = target_b.controldir.sprout('final2',
110
 
                                          revision_id=b'C-id').open_branch()
 
112
                                              revision_id=b'C-id').open_branch()
111
113
        self.assertEqual(b'C-id', final_b.last_revision())
112
114
 
113
115
    def make_source_with_ghost_and_stacked_target(self):
179
181
            repo_missing_fallbacks,
180
182
            fetch_spec=vf_search.EverythingResult(repo_missing_fallbacks))
181
183
        self.assertEqual(repo_missing_fallbacks.revisions.keys(),
182
 
            target.revisions.keys())
 
184
                         target.revisions.keys())
183
185
        self.assertEqual(repo_missing_fallbacks.inventories.keys(),
184
 
            target.inventories.keys())
 
186
                         target.inventories.keys())
185
187
        self.assertEqual([b'C-id'],
186
 
            sorted(k[-1] for k in target.revisions.keys()))
 
188
                         sorted(k[-1] for k in target.revisions.keys()))
187
189
        self.assertEqual([b'B-id', b'C-id'],
188
 
            sorted(k[-1] for k in target.inventories.keys()))
189
 
 
190
 
 
191
 
 
 
190
                         sorted(k[-1] for k in target.inventories.keys()))