← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/upstream_import.py

  • Committer: Aaron Bentley
  • Date: 2007-02-02 14:00:28 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070202140028-8m53m27am3d4twc7
Colordiff warns on long lines

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/upstream_import.py
7
7
 
8
8
from bzrlib import osutils
9
9
from bzrlib.bzrdir import BzrDir
10
 
from bzrlib.plugins.bzrtools.upstream_import import (
11
 
    common_directory,
12
 
    import_archive,
13
 
    import_tar,
14
 
    import_zip,
15
 
    import_dir,
16
 
    top_directory,
17
 
    ZipFileWrapper,
18
 
)
 
10
try:
 
11
    from bzrlib.plugins.bzrtools.upstream_import import (
 
12
        common_directory,
 
13
        import_tar,
 
14
        import_zip,
 
15
        import_dir,
 
16
        top_directory,
 
17
        ZipFileWrapper, 
 
18
    )
 
19
except ImportError:
 
20
    from bzrtools.upstream_import import (
 
21
        common_directory,
 
22
        import_tar,
 
23
        import_zip,
 
24
        import_dir,
 
25
        top_directory,
 
26
        ZipFileWrapper, 
 
27
    )
19
28
from bzrlib.tests import TestCaseInTempDir
20
29
 
21
30
 
22
 
def import_tar_broken(tree, tar_input):
23
 
    """
24
 
    Import a tarfile with names that that end in //, e.g. Feisty Python 2.5
25
 
    """
26
 
    tar_file = tarfile.open('lala', 'r', tar_input)
27
 
    for member in tar_file.members:
28
 
        if member.name.endswith('/'):
29
 
            member.name += '/'
30
 
    import_archive(tree, tar_file)
31
 
 
32
 
 
33
31
class DirFileWriter(object):
34
32
 
35
33
    def __init__(self, fileobj, mode):
81
79
                os.chdir('project-0.1')
82
80
            os.mkdir(prefix + 'junk')
83
81
            archive_file.add(prefix + 'junk')
84
 
 
 
82
            
85
83
            f = file(prefix + 'README', 'wb')
86
84
            f.write('What?')
87
85
            f.close()
111
109
            else:
112
110
                prefix=''
113
111
                os.chdir('project-0.2')
114
 
 
 
112
            
115
113
            os.mkdir(prefix + 'junk')
116
114
            archive_file.add(prefix + 'junk')
117
115
 
139
137
 
140
138
        os.mkdir('project-0.2')
141
139
        tar_file.add('project-0.2')
142
 
 
 
140
        
143
141
        f = file('project-0.1/README', 'wb')
144
142
        f.write('What?')
145
143
        f.close()
168
166
            return tarfile.open('project-0.1.tar', mode, fileobj)
169
167
        self.archive_test(builder, import_tar)
170
168
 
171
 
    def test_broken_tar(self):
172
 
        def builder(fileobj, mode='w'):
173
 
            return tarfile.open('project-0.1.tar', mode, fileobj)
174
 
        self.archive_test(builder, import_tar_broken, subdir=True)
175
 
 
176
169
    def test_unzip(self):
177
170
        def builder(fileobj, mode='w'):
178
171
            return ZipFileWrapper(fileobj, mode)
188
181
    def archive_test(self, builder, importer, subdir=False):
189
182
        archive_file = self.make_archive(builder, subdir)
190
183
        tree = BzrDir.create_standalone_workingtree('tree')
191
 
        tree.lock_write()
192
 
        try:
193
 
            importer(tree, archive_file)
194
 
            self.assertTrue(tree.path2id('README') is not None)
195
 
            self.assertTrue(tree.path2id('FEEDME') is not None)
196
 
            self.assertTrue(os.path.isfile(tree.abspath('README')))
197
 
            self.assertEqual(tree.inventory[tree.path2id('README')].kind,
198
 
                'file')
199
 
            self.assertEqual(tree.inventory[tree.path2id('FEEDME')].kind,
200
 
                'file')
201
 
            f = file(tree.abspath('junk/food'), 'wb')
202
 
            f.write('I like food\n')
203
 
            f.close()
 
184
        importer(tree, archive_file)
 
185
        self.assertTrue(tree.path2id('README') is not None) 
 
186
        self.assertTrue(tree.path2id('FEEDME') is not None)
 
187
        self.assertTrue(os.path.isfile(tree.abspath('README')))
 
188
        self.assertEqual(tree.inventory[tree.path2id('README')].kind, 'file')
 
189
        self.assertEqual(tree.inventory[tree.path2id('FEEDME')].kind, 'file')
 
190
        
 
191
        f = file(tree.abspath('junk/food'), 'wb')
 
192
        f.write('I like food\n')
 
193
        f.close()
204
194
 
205
 
            archive_file = self.make_archive2(builder, subdir)
206
 
            importer(tree, archive_file)
207
 
            self.assertTrue(tree.path2id('README') is not None)
208
 
            self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))
209
 
        finally:
210
 
            tree.unlock()
 
195
        archive_file = self.make_archive2(builder, subdir)
 
196
        importer(tree, archive_file)
 
197
        self.assertTrue(tree.path2id('README') is not None) 
 
198
        self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))
211
199
 
212
200
 
213
201
    def test_untar2(self):
214
202
        tar_file = self.make_messed_tar()
215
203
        tree = BzrDir.create_standalone_workingtree('tree')
216
204
        import_tar(tree, tar_file)
217
 
        self.assertTrue(tree.path2id('project-0.1/README') is not None)
 
205
        self.assertTrue(tree.path2id('project-0.1/README') is not None) 
218
206
 
219
207
    def test_untar_gzip(self):
220
208
        tar_file = self.make_tar(mode='w:gz')
221
209
        tree = BzrDir.create_standalone_workingtree('tree')
222
210
        import_tar(tree, tar_file)
223
 
        self.assertTrue(tree.path2id('README') is not None)
 
211
        self.assertTrue(tree.path2id('README') is not None) 
224
212
 
225
213
def test_suite():
226
214
    return makeSuite(TestImport)