/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/test_memorytree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-06 01:18:08 UTC
  • mfrom: (7143 work)
  • mto: This revision was merged to the branch mainline in revision 7151.
  • Revision ID: jelmer@jelmer.uk-20181106011808-y870f4vq0ork3ahu
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_memorytree.py
48
48
        tree = MemoryTree.create_on_branch(branch)
49
49
        tree.lock_read()
50
50
        self.assertEqual([rev_id], tree.get_parent_ids())
51
 
        self.assertEqual('contents of foo\n',
52
 
            tree.get_file('foo').read())
 
51
        with tree.get_file('foo') as f:
 
52
            self.assertEqual(b'contents of foo\n', f.read())
53
53
        tree.unlock()
54
54
 
55
55
    def test_get_root_id(self):
110
110
        tree.lock_write()
111
111
        tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
112
112
                  kinds=['directory', 'file'])
113
 
        tree.put_file_bytes_non_atomic('foo', 'barshoom')
114
 
        self.assertEqual('barshoom', tree.get_file('foo').read())
 
113
        tree.put_file_bytes_non_atomic('foo', b'barshoom')
 
114
        self.assertEqual(b'barshoom', tree.get_file('foo').read())
115
115
        tree.unlock()
116
116
 
117
117
    def test_put_existing_file(self):
120
120
        tree.lock_write()
121
121
        tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
122
122
                 kinds=['directory', 'file'])
123
 
        tree.put_file_bytes_non_atomic('foo', 'first-content')
124
 
        tree.put_file_bytes_non_atomic('foo', 'barshoom')
125
 
        self.assertEqual('barshoom', tree.get_file('foo').read())
 
123
        tree.put_file_bytes_non_atomic('foo', b'first-content')
 
124
        tree.put_file_bytes_non_atomic('foo', b'barshoom')
 
125
        self.assertEqual(b'barshoom', tree.get_file('foo').read())
126
126
        tree.unlock()
127
127
 
128
128
    def test_add_in_subdir(self):
135
135
        # that *always* adds the directory as well. So if you want to create a
136
136
        # file in a subdirectory, you have to split out the 'mkdir()' calls
137
137
        # from the add and put_file_bytes_non_atomic calls. :(
138
 
        tree.mkdir('adir', 'dir-id')
 
138
        tree.mkdir('adir', b'dir-id')
139
139
        tree.add(['adir/afile'], [b'file-id'], ['file'])
140
140
        self.assertEqual('adir/afile', tree.id2path(b'file-id'))
141
141
        self.assertEqual('adir', tree.id2path(b'dir-id'))
142
 
        tree.put_file_bytes_non_atomic('adir/afile', 'barshoom')
 
142
        tree.put_file_bytes_non_atomic('adir/afile', b'barshoom')
143
143
 
144
144
    def test_commit_trivial(self):
145
145
        """Smoke test for commit on a MemoryTree.
152
152
        tree.lock_write()
153
153
        tree.add(['', 'foo'], ids=[b'root-id', b'foo-id'],
154
154
                 kinds=['directory', 'file'])
155
 
        tree.put_file_bytes_non_atomic('foo', 'barshoom')
 
155
        tree.put_file_bytes_non_atomic('foo', b'barshoom')
156
156
        revision_id = tree.commit('message baby')
157
157
        # the parents list for the tree should have changed.
158
158
        self.assertEqual([revision_id], tree.get_parent_ids())
161
161
        revtree = tree.branch.repository.revision_tree(revision_id)
162
162
        revtree.lock_read()
163
163
        self.addCleanup(revtree.unlock)
164
 
        self.assertEqual('barshoom', revtree.get_file('foo').read())
 
164
        with revtree.get_file('foo') as f:
 
165
            self.assertEqual(b'barshoom', f.read())
165
166
 
166
167
    def test_unversion(self):
167
168
        """Some test for unversion of a memory tree."""
189
190
        tree.lock_write()
190
191
        self.addCleanup(tree.unlock)
191
192
        tree.add(['', 'foo'], [b'root-id', b'foo-id'], ['directory', 'file'])
192
 
        tree.put_file_bytes_non_atomic('foo', 'content\n')
 
193
        tree.put_file_bytes_non_atomic('foo', b'content\n')
193
194
        tree.commit('one', rev_id=b'rev-one')
194
195
        tree.rename_one('foo', 'bar')
195
196
        self.assertEqual('bar', tree.id2path(b'foo-id'))
196
 
        self.assertEqual('content\n', tree._file_transport.get_bytes('bar'))
 
197
        self.assertEqual(b'content\n', tree._file_transport.get_bytes('bar'))
197
198
        self.assertRaises(errors.NoSuchFile,
198
199
                          tree._file_transport.get_bytes, 'foo')
199
200
        tree.commit('two', rev_id=b'rev-two')
200
 
        self.assertEqual('content\n', tree._file_transport.get_bytes('bar'))
 
201
        self.assertEqual(b'content\n', tree._file_transport.get_bytes('bar'))
201
202
        self.assertRaises(errors.NoSuchFile,
202
203
                          tree._file_transport.get_bytes, 'foo')
203
204
 
204
205
        rev_tree2 = tree.branch.repository.revision_tree(b'rev-two')
205
206
        self.assertEqual('bar', rev_tree2.id2path(b'foo-id'))
206
 
        self.assertEqual('content\n', rev_tree2.get_file_text('bar'))
 
207
        self.assertEqual(b'content\n', rev_tree2.get_file_text('bar'))
207
208
 
208
209
    def test_rename_file_to_subdir(self):
209
210
        tree = self.make_branch_and_memory_tree('branch')
212
213
        tree.add('')
213
214
        tree.mkdir('subdir', b'subdir-id')
214
215
        tree.add('foo', b'foo-id', 'file')
215
 
        tree.put_file_bytes_non_atomic('foo', 'content\n')
 
216
        tree.put_file_bytes_non_atomic('foo', b'content\n')
216
217
        tree.commit('one', rev_id=b'rev-one')
217
218
 
218
219
        tree.rename_one('foo', 'subdir/bar')
219
220
        self.assertEqual('subdir/bar', tree.id2path(b'foo-id'))
220
 
        self.assertEqual('content\n',
 
221
        self.assertEqual(b'content\n',
221
222
                         tree._file_transport.get_bytes('subdir/bar'))
222
223
        tree.commit('two', rev_id=b'rev-two')
223
224
        rev_tree2 = tree.branch.repository.revision_tree(b'rev-two')