← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/upstream_import.py

  • Committer: Charlie Shepherd
  • Date: 2007-04-04 18:12:00 UTC
  • mto: This revision was merged to the branch mainline in revision 538.
  • Revision ID: masterdriverz@gentoo.org-20070404181200-wqiwytdor9srux2v
Remove all trailing whitespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/upstream_import.py
13
13
    import_tar,
14
14
    import_zip,
15
15
    import_dir,
16
 
    top_path,
 
16
    top_directory,
17
17
    ZipFileWrapper,
18
18
)
19
19
from bzrlib.tests import TestCaseInTempDir
154
154
            return ZipFileWrapper(fileobj, 'w')
155
155
        return self.make_archive(maker)
156
156
 
157
 
    def make_tar_with_bzrdir(self):
158
 
        result = StringIO()
159
 
        tar_file = tarfile.open('tar-with-bzrdir.tar', 'w', result)
160
 
        os.mkdir('toplevel-dir')
161
 
        tar_file.add('toplevel-dir')
162
 
        os.mkdir('toplevel-dir/.bzr')
163
 
        tar_file.add('toplevel-dir/.bzr')
164
 
        tar_file.close()
165
 
        rmtree('toplevel-dir')
166
 
        result.seek(0)
167
 
        return result
168
 
 
169
 
    def test_top_path(self):
170
 
        self.assertEqual(top_path('ab/b/c'), 'ab')
171
 
        self.assertEqual(top_path('etc'), 'etc')
172
 
        self.assertEqual(top_path('project-0.1'), 'project-0.1')
 
157
    def test_top_directory(self):
 
158
        self.assertEqual(top_directory('ab/b/c'), 'ab')
 
159
        self.assertEqual(top_directory('/etc'), '/')
173
160
 
174
161
    def test_common_directory(self):
175
162
        self.assertEqual(common_directory(['ab/c/d', 'ab/c/e']), 'ab')
176
163
        self.assertIs(common_directory(['ab/c/d', 'ac/c/e']), None)
177
 
        self.assertEqual('FEEDME', common_directory(['FEEDME']))
 
164
        self.assertIs(None, common_directory(['FEEDME']))
178
165
 
179
166
    def test_untar(self):
180
167
        def builder(fileobj, mode='w'):
235
222
        import_tar(tree, tar_file)
236
223
        self.assertTrue(tree.path2id('README') is not None)
237
224
 
238
 
    def test_no_crash_with_bzrdir(self):
239
 
        tar_file = self.make_tar_with_bzrdir()
240
 
        tree = BzrDir.create_standalone_workingtree('tree')
241
 
        import_tar(tree, tar_file)
242
 
        # So long as it did not crash, that should be ok
243
 
 
244
225
def test_suite():
245
226
    return makeSuite(TestImport)