← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/upstream_import.py

  • Committer: Jelmer Vernooij
  • Date: 2011-06-24 13:35:53 UTC
  • mto: This revision was merged to the branch mainline in revision 771.
  • Revision ID: jelmer@samba.org-20110624133553-h9s8syvvvsvpd1o9
Add support for importing .tar.xz and .tar.lzma files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/upstream_import.py
5
5
import tempfile
6
6
from unittest import makeSuite
7
7
 
8
 
from bzrlib import osutils
 
8
from bzrlib import (
 
9
    osutils,
 
10
    revision as _mod_revision,
 
11
    transform
 
12
    )
9
13
from bzrlib.bzrdir import BzrDir
 
14
from bzrlib.export.tar_exporter import export_tarball
10
15
from bzrlib.plugins.bzrtools.upstream_import import (
11
16
    common_directory,
12
17
    import_archive,
13
18
    import_tar,
14
19
    import_zip,
15
20
    import_dir,
16
 
    top_directory,
 
21
    top_path,
17
22
    ZipFileWrapper,
18
23
)
19
 
from bzrlib.tests import TestCaseInTempDir
 
24
from bzrlib.tests import (
 
25
    TestCaseInTempDir,
 
26
    TestCaseWithTransport,
 
27
    UnicodeFilenameFeature,
 
28
    )
20
29
 
21
30
 
22
31
def import_tar_broken(tree, tar_input):
119
128
            f.write('Now?')
120
129
            f.close()
121
130
            archive_file.add(prefix + 'README')
122
 
            archive_file.close()
123
131
 
124
 
            archive_file = builder(result, 'a')
 
132
            f = file(prefix + 'README', 'wb')
 
133
            f.write('Wow?')
 
134
            f.close()
 
135
            # Add a second entry for README with different contents.
125
136
            archive_file.add(prefix + 'README')
126
137
            archive_file.close()
127
138
 
154
165
            return ZipFileWrapper(fileobj, 'w')
155
166
        return self.make_archive(maker)
156
167
 
157
 
    def test_top_directory(self):
158
 
        self.assertEqual(top_directory('ab/b/c'), 'ab')
159
 
        self.assertEqual(top_directory('/etc'), '/')
 
168
    def make_tar_with_bzrdir(self):
 
169
        result = StringIO()
 
170
        tar_file = tarfile.open('tar-with-bzrdir.tar', 'w', result)
 
171
        os.mkdir('toplevel-dir')
 
172
        tar_file.add('toplevel-dir')
 
173
        os.mkdir('toplevel-dir/.bzr')
 
174
        tar_file.add('toplevel-dir/.bzr')
 
175
        tar_file.close()
 
176
        rmtree('toplevel-dir')
 
177
        result.seek(0)
 
178
        return result
 
179
 
 
180
    def test_top_path(self):
 
181
        self.assertEqual(top_path('ab/b/c'), 'ab')
 
182
        self.assertEqual(top_path('etc'), 'etc')
 
183
        self.assertEqual(top_path('project-0.1'), 'project-0.1')
160
184
 
161
185
    def test_common_directory(self):
162
186
        self.assertEqual(common_directory(['ab/c/d', 'ab/c/e']), 'ab')
163
187
        self.assertIs(common_directory(['ab/c/d', 'ac/c/e']), None)
164
 
        self.assertIs(None, common_directory(['FEEDME']))
 
188
        self.assertEqual('FEEDME', common_directory(['FEEDME']))
165
189
 
166
190
    def test_untar(self):
167
191
        def builder(fileobj, mode='w'):
205
229
            archive_file = self.make_archive2(builder, subdir)
206
230
            importer(tree, archive_file)
207
231
            self.assertTrue(tree.path2id('README') is not None)
 
232
            # Ensure the second version of the file is used.
 
233
            self.assertEqual(tree.get_file_text(tree.path2id('README')),
 
234
                             'Wow?')
208
235
            self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))
209
236
        finally:
210
237
            tree.unlock()
222
249
        import_tar(tree, tar_file)
223
250
        self.assertTrue(tree.path2id('README') is not None)
224
251
 
 
252
    def test_no_crash_with_bzrdir(self):
 
253
        tar_file = self.make_tar_with_bzrdir()
 
254
        tree = BzrDir.create_standalone_workingtree('tree')
 
255
        import_tar(tree, tar_file)
 
256
        # So long as it did not crash, that should be ok
 
257
 
 
258
 
 
259
class TestWithStuff(TestCaseWithTransport):
 
260
 
 
261
    def transform_to_tar(self, tt):
 
262
        stream = StringIO()
 
263
        tarball = tarfile.open(None, 'w|', stream)
 
264
        export_tarball(tt.get_preview_tree(), tarball, '')
 
265
        return stream
 
266
 
 
267
    def get_empty_tt(self):
 
268
        b = self.make_repository('foo')
 
269
        null_tree = b.revision_tree(_mod_revision.NULL_REVISION)
 
270
        tt = transform.TransformPreview(null_tree)
 
271
        root = tt.new_directory('', transform.ROOT_PARENT, 'tree-root')
 
272
        tt.fixup_new_roots()
 
273
        self.addCleanup(tt.finalize)
 
274
        return tt
 
275
 
 
276
    def test_nonascii_paths(self):
 
277
        self.requireFeature(UnicodeFilenameFeature)
 
278
        tt = self.get_empty_tt()
 
279
        encoded_file = tt.new_file(
 
280
            u'\u1234file', tt.root, 'contents', 'new-file')
 
281
        encoded_file = tt.new_file(
 
282
            'other', tt.root, 'contents', 'other-file')
 
283
        tarfile = self.transform_to_tar(tt)
 
284
        tarfile.seek(0)
 
285
        tree = self.make_branch_and_tree('bar')
 
286
        import_tar(tree, tarfile)
 
287
        self.assertPathExists(u'bar/\u1234file')
 
288
 
 
289
 
225
290
def test_suite():
226
291
    return makeSuite(TestImport)