← 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-01-17 14:30:19 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070117143019-rj3n4op1aqav7bs5
Update versions to 0.15

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/upstream_import.py
21
21
        common_directory,
22
22
        import_tar,
23
23
        import_zip,
 
24
        import_dir,
24
25
        top_directory,
25
26
        ZipFileWrapper, 
26
27
    )
97
98
        result.seek(0)
98
99
        return result
99
100
 
100
 
    def make_archive2(self, builder):
 
101
    def make_archive2(self, builder, subdir):
101
102
        result = StringIO()
102
 
        tar_file = builder(result)
 
103
        archive_file = builder(result)
103
104
        os.mkdir('project-0.2')
104
 
        tar_file.add('project-0.2')
105
 
        
106
 
        os.mkdir('project-0.2/junk')
107
 
        tar_file.add('project-0.2/junk')
108
 
 
109
 
        f = file('project-0.2/README', 'wb')
110
 
        f.write('Now?')
111
 
        f.close()
112
 
        tar_file.add('project-0.2/README')
113
 
        tar_file.close()
114
 
 
115
 
        tar_file = builder(result, 'a')
116
 
        tar_file.add('project-0.2/README')
117
 
 
118
 
        rmtree('project-0.2')
119
 
        tar_file.close()
 
105
        try:
 
106
            if subdir:
 
107
                prefix='project-0.2/'
 
108
                archive_file.add('project-0.2')
 
109
            else:
 
110
                prefix=''
 
111
                os.chdir('project-0.2')
 
112
            
 
113
            os.mkdir(prefix + 'junk')
 
114
            archive_file.add(prefix + 'junk')
 
115
 
 
116
            f = file(prefix + 'README', 'wb')
 
117
            f.write('Now?')
 
118
            f.close()
 
119
            archive_file.add(prefix + 'README')
 
120
            archive_file.close()
 
121
 
 
122
            archive_file = builder(result, 'a')
 
123
            archive_file.add(prefix + 'README')
 
124
            archive_file.close()
 
125
 
 
126
        finally:
 
127
            if not subdir:
 
128
                os.chdir('..')
120
129
        result.seek(0)
121
130
        return result
122
131
 
183
192
        f.write('I like food\n')
184
193
        f.close()
185
194
 
186
 
        archive_file = self.make_archive2(builder)
 
195
        archive_file = self.make_archive2(builder, subdir)
187
196
        importer(tree, archive_file)
188
197
        self.assertTrue(tree.path2id('README') is not None) 
189
198
        self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))