← 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: 2008-05-30 02:46:25 UTC
  • Revision ID: aaron@aaronbentley.com-20080530024625-anlzob2j6z2s7ebv
Remove references to PyBaz

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
 
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
 
    )
 
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
)
28
19
from bzrlib.tests import TestCaseInTempDir
29
20
 
30
21
 
 
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
 
31
33
class DirFileWriter(object):
32
34
 
33
35
    def __init__(self, fileobj, mode):
79
81
                os.chdir('project-0.1')
80
82
            os.mkdir(prefix + 'junk')
81
83
            archive_file.add(prefix + 'junk')
82
 
            
 
84
 
83
85
            f = file(prefix + 'README', 'wb')
84
86
            f.write('What?')
85
87
            f.close()
109
111
            else:
110
112
                prefix=''
111
113
                os.chdir('project-0.2')
112
 
            
 
114
 
113
115
            os.mkdir(prefix + 'junk')
114
116
            archive_file.add(prefix + 'junk')
115
117
 
137
139
 
138
140
        os.mkdir('project-0.2')
139
141
        tar_file.add('project-0.2')
140
 
        
 
142
 
141
143
        f = file('project-0.1/README', 'wb')
142
144
        f.write('What?')
143
145
        f.close()
166
168
            return tarfile.open('project-0.1.tar', mode, fileobj)
167
169
        self.archive_test(builder, import_tar)
168
170
 
 
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
 
169
176
    def test_unzip(self):
170
177
        def builder(fileobj, mode='w'):
171
178
            return ZipFileWrapper(fileobj, mode)
181
188
    def archive_test(self, builder, importer, subdir=False):
182
189
        archive_file = self.make_archive(builder, subdir)
183
190
        tree = BzrDir.create_standalone_workingtree('tree')
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()
 
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()
194
204
 
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')))
 
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()
199
211
 
200
212
 
201
213
    def test_untar2(self):
202
214
        tar_file = self.make_messed_tar()
203
215
        tree = BzrDir.create_standalone_workingtree('tree')
204
216
        import_tar(tree, tar_file)
205
 
        self.assertTrue(tree.path2id('project-0.1/README') is not None) 
 
217
        self.assertTrue(tree.path2id('project-0.1/README') is not None)
206
218
 
207
219
    def test_untar_gzip(self):
208
220
        tar_file = self.make_tar(mode='w:gz')
209
221
        tree = BzrDir.create_standalone_workingtree('tree')
210
222
        import_tar(tree, tar_file)
211
 
        self.assertTrue(tree.path2id('README') is not None) 
 
223
        self.assertTrue(tree.path2id('README') is not None)
212
224
 
213
225
def test_suite():
214
226
    return makeSuite(TestImport)