← Back to branch summary

~benoit.pierre/bzrtools/shell_improvements

« back to all changes in this revision

Viewing changes to tests/upstream_import.py

  • Committer: Benoît Pierre
  • Date: 2009-08-02 12:55:24 UTC
  • mfrom: (682.1.36 bzrtools)
  • Revision ID: benoit.pierre@gmail.com-20090802125524-1p2oot1y2l0y3o9w
Merge with upstream.

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_directory,
 
16
    top_path,
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 test_top_directory(self):
158
 
        self.assertEqual(top_directory('ab/b/c'), 'ab')
159
 
        self.assertEqual(top_directory('/etc'), '/')
 
157
    def test_top_path(self):
 
158
        self.assertEqual(top_path('ab/b/c'), 'ab')
 
159
        self.assertEqual(top_path('etc'), 'etc')
 
160
        self.assertEqual(top_path('project-0.1'), 'project-0.1')
160
161
 
161
162
    def test_common_directory(self):
162
163
        self.assertEqual(common_directory(['ab/c/d', 'ab/c/e']), 'ab')
163
164
        self.assertIs(common_directory(['ab/c/d', 'ac/c/e']), None)
164
 
        self.assertIs(None, common_directory(['FEEDME']))
 
165
        self.assertEqual('FEEDME', common_directory(['FEEDME']))
165
166
 
166
167
    def test_untar(self):
167
168
        def builder(fileobj, mode='w'):