~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/upstream_import.py

• browse files at revision 528
• compare with another revision
• download diff
• download tarball
• view history from revision 528

• reverse the comparison (528 to 770.1.1)
• stop comparing with revision 770.1.1

Show diffs side-by-side

added

removed

tests/upstream_import.py

5

5

import tempfile

6

6

from unittest import makeSuite

7

7

 

8

 

from bzrlib import (

9

 

    osutils,

10

 

    revision as _mod_revision,

11

 

    transform

12

 

    )

 

8

from bzrlib import osutils

13

9

from bzrlib.bzrdir import BzrDir

14

 

from bzrlib.export.tar_exporter import export_tarball

15

10

from bzrlib.plugins.bzrtools.upstream_import import (

16

11

    common_directory,

17

12

    import_archive,

18

13

    import_tar,

19

14

    import_zip,

20

15

    import_dir,

21

 

    top_path,

22

 

    ZipFileWrapper,

 

16

    top_directory,

 

17

    ZipFileWrapper, 

23

18

)

24

 

from bzrlib.tests import (

25

 

    TestCaseInTempDir,

26

 

    TestCaseWithTransport,

27

 

    UnicodeFilenameFeature,

28

 

    )

 

19

from bzrlib.tests import TestCaseInTempDir

29

20

 

30

21

 

31

22

def import_tar_broken(tree, tar_input):

90

81

                os.chdir('project-0.1')

91

82

            os.mkdir(prefix + 'junk')

92

83

            archive_file.add(prefix + 'junk')

93

 

 

 

84

            

94

85

            f = file(prefix + 'README', 'wb')

95

86

            f.write('What?')

96

87

            f.close()

120

111

            else:

121

112

                prefix=''

122

113

                os.chdir('project-0.2')

123

 

 

 

114

            

124

115

            os.mkdir(prefix + 'junk')

125

116

            archive_file.add(prefix + 'junk')

126

117

 

128

119

            f.write('Now?')

129

120

            f.close()

130

121

            archive_file.add(prefix + 'README')

 

122

            archive_file.close()

131

123

 

132

 

            f = file(prefix + 'README', 'wb')

133

 

            f.write('Wow?')

134

 

            f.close()

135

 

            # Add a second entry for README with different contents.

 

124

            archive_file = builder(result, 'a')

136

125

            archive_file.add(prefix + 'README')

137

126

            archive_file.close()

138

127

 

150

139

 

151

140

        os.mkdir('project-0.2')

152

141

        tar_file.add('project-0.2')

153

 

 

 

142

        

154

143

        f = file('project-0.1/README', 'wb')

155

144

        f.write('What?')

156

145

        f.close()

165

154

            return ZipFileWrapper(fileobj, 'w')

166

155

        return self.make_archive(maker)

167

156

 

168

 

    def make_tar_with_bzrdir(self):

169

 

        result = StringIO()

170

 

        tar_file = tarfile.open('tar-with-bzrdir.tar', 'w', result)

171

 

        os.mkdir('toplevel-dir')

172

 

        tar_file.add('toplevel-dir')

173

 

        os.mkdir('toplevel-dir/.bzr')

174

 

        tar_file.add('toplevel-dir/.bzr')

175

 

        tar_file.close()

176

 

        rmtree('toplevel-dir')

177

 

        result.seek(0)

178

 

        return result

179

 

 

180

 

    def test_top_path(self):

181

 

        self.assertEqual(top_path('ab/b/c'), 'ab')

182

 

        self.assertEqual(top_path('etc'), 'etc')

183

 

        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'), '/')

184

160

 

185

161

    def test_common_directory(self):

186

162

        self.assertEqual(common_directory(['ab/c/d', 'ab/c/e']), 'ab')

187

163

        self.assertIs(common_directory(['ab/c/d', 'ac/c/e']), None)

188

 

        self.assertEqual('FEEDME', common_directory(['FEEDME']))

 

164

        self.assertIs(None, common_directory(['FEEDME']))

189

165

 

190

166

    def test_untar(self):

191

167

        def builder(fileobj, mode='w'):

229

205

            archive_file = self.make_archive2(builder, subdir)

230

206

            importer(tree, archive_file)

231

207

            self.assertTrue(tree.path2id('README') is not None)

232

 

            # Ensure the second version of the file is used.

233

 

            self.assertEqual(tree.get_file_text(tree.path2id('README')),

234

 

                             'Wow?')

235

208

            self.assertTrue(not os.path.exists(tree.abspath('FEEDME')))

236

209

        finally:

237

210

            tree.unlock()

241

214

        tar_file = self.make_messed_tar()

242

215

        tree = BzrDir.create_standalone_workingtree('tree')

243

216

        import_tar(tree, tar_file)

244

 

        self.assertTrue(tree.path2id('project-0.1/README') is not None)

 

217

        self.assertTrue(tree.path2id('project-0.1/README') is not None) 

245

218

 

246

219

    def test_untar_gzip(self):

247

220

        tar_file = self.make_tar(mode='w:gz')

248

221

        tree = BzrDir.create_standalone_workingtree('tree')

249

222

        import_tar(tree, tar_file)

250

 

        self.assertTrue(tree.path2id('README') is not None)

251

 

 

252

 

    def test_no_crash_with_bzrdir(self):

253

 

        tar_file = self.make_tar_with_bzrdir()

254

 

        tree = BzrDir.create_standalone_workingtree('tree')

255

 

        import_tar(tree, tar_file)

256

 

        # So long as it did not crash, that should be ok

257

 

 

258

 

 

259

 

class TestWithStuff(TestCaseWithTransport):

260

 

 

261

 

    def transform_to_tar(self, tt):

262

 

        stream = StringIO()

263

 

        tarball = tarfile.open(None, 'w|', stream)

264

 

        export_tarball(tt.get_preview_tree(), tarball, '')

265

 

        return stream

266

 

 

267

 

    def get_empty_tt(self):

268

 

        b = self.make_repository('foo')

269

 

        null_tree = b.revision_tree(_mod_revision.NULL_REVISION)

270

 

        tt = transform.TransformPreview(null_tree)

271

 

        root = tt.new_directory('', transform.ROOT_PARENT, 'tree-root')

272

 

        tt.fixup_new_roots()

273

 

        self.addCleanup(tt.finalize)

274

 

        return tt

275

 

 

276

 

    def test_nonascii_paths(self):

277

 

        self.requireFeature(UnicodeFilenameFeature)

278

 

        tt = self.get_empty_tt()

279

 

        encoded_file = tt.new_file(

280

 

            u'\u1234file', tt.root, 'contents', 'new-file')

281

 

        encoded_file = tt.new_file(

282

 

            'other', tt.root, 'contents', 'other-file')

283

 

        tarfile = self.transform_to_tar(tt)

284

 

        tarfile.seek(0)

285

 

        tree = self.make_branch_and_tree('bar')

286

 

        import_tar(tree, tarfile)

287

 

        self.assertPathExists(u'bar/\u1234file')

288

 

 

 

223

        self.assertTrue(tree.path2id('README') is not None) 

289

224

 

290

225

def test_suite():

291

226

    return makeSuite(TestImport)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1