~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

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

• reverse the comparison (5401 to 3735.40.19)
• stop comparing with revision 3735.40.19

Show diffs side-by-side

added

removed

bzrlib/tests/test_fetch.py

1

 

# Copyright (C) 2005, 2007 Canonical Ltd

 

1

# Copyright (C) 2005, 2007, 2010 Canonical Ltd

2

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

31

31

from bzrlib.bzrdir import BzrDir

32

32

from bzrlib.repofmt import knitrepo

33

33

from bzrlib.tests import TestCaseWithTransport

34

 

from bzrlib.tests.http_utils import TestCaseWithWebserver

35

34

from bzrlib.tests.test_revision import make_branches

36

35

from bzrlib.trace import mutter

37

36

from bzrlib.upgrade import Convert

38

37

from bzrlib.workingtree import WorkingTree

39

38

 

40

39

# These tests are a bit old; please instead add new tests into

41

 

# interrepository_implementations/ so they'll run on all relevant

 

40

# per_interrepository/ so they'll run on all relevant

42

41

# combinations.

43

42

 

44

43

 

95

94

    br_a3.fetch(br_a2, br_a.revision_history()[2])

96

95

    # pull the 3 revisions introduced by a@u-0-3

97

96

    br_a3.fetch(br_a2, br_a.revision_history()[3])

98

 

    # InstallFailed should be raised if the branch is missing the revision

 

97

    # NoSuchRevision should be raised if the branch is missing the revision

99

98

    # that was requested.

100

 

    self.assertRaises(errors.InstallFailed, br_a3.fetch, br_a2, 'pizza')

 

99

    self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')

101

100

 

102

101

    # TODO: Test trying to fetch from a branch that points to a revision not

103

102

    # actually present in its repository.  Not every branch format allows you

248

247

                    rev_id).get_file_text('this-file-id'), text)

249

248

 

250

249

 

251

 

class TestHttpFetch(TestCaseWithWebserver):

252

 

    # FIXME RBC 20060124 this really isn't web specific, perhaps an

253

 

    # instrumented readonly transport? Can we do an instrumented

254

 

    # adapter and use self.get_readonly_url ?

255

 

 

256

 

    def test_fetch(self):

257

 

        #highest indices a: 5, b: 7

258

 

        br_a, br_b = make_branches(self)

259

 

        br_rem_a = Branch.open(self.get_readonly_url('branch1'))

260

 

        fetch_steps(self, br_rem_a, br_b, br_a)

261

 

 

262

 

    def _count_log_matches(self, target, logs):

263

 

        """Count the number of times the target file pattern was fetched in an http log"""

264

 

        get_succeeds_re = re.compile(

265

 

            '.*"GET .*%s HTTP/1.1" 20[06] - "-" "bzr/%s' %

266

 

            (     target,                    bzrlib.__version__))

267

 

        c = 0

268

 

        for line in logs:

269

 

            if get_succeeds_re.match(line):

270

 

                c += 1

271

 

        return c

272

 

 

273

 

    def test_weaves_are_retrieved_once(self):

274

 

        self.build_tree(("source/", "source/file", "target/"))

275

 

        # This test depends on knit dasta storage.

276

 

        wt = self.make_branch_and_tree('source', format='dirstate-tags')

277

 

        branch = wt.branch

278

 

        wt.add(["file"], ["id"])

279

 

        wt.commit("added file")

280

 

        open("source/file", 'w').write("blah\n")

281

 

        wt.commit("changed file")

282

 

        target = BzrDir.create_branch_and_repo("target/")

283

 

        source = Branch.open(self.get_readonly_url("source/"))

284

 

        target.fetch(source)

285

 

        # this is the path to the literal file. As format changes

286

 

        # occur it needs to be updated. FIXME: ask the store for the

287

 

        # path.

288

 

        self.log("web server logs are:")

289

 

        http_logs = self.get_readonly_server().logs

290

 

        self.log('\n'.join(http_logs))

291

 

        # unfortunately this log entry is branch format specific. We could

292

 

        # factor out the 'what files does this format use' to a method on the

293

 

        # repository, which would let us to this generically. RBC 20060419

294

 

        # RBC 20080408: Or perhaps we can assert that no files are fully read

295

 

        # twice?

296

 

        self.assertEqual(1, self._count_log_matches('/ce/id.kndx', http_logs))

297

 

        self.assertEqual(1, self._count_log_matches('/ce/id.knit', http_logs))

298

 

        self.assertEqual(1, self._count_log_matches('inventory.kndx', http_logs))

299

 

        # this r-h check test will prevent regressions, but it currently already

300

 

        # passes, before the patch to cache-rh is applied :[

301

 

        self.assertTrue(1 >= self._count_log_matches('revision-history',

302

 

                                                     http_logs))

303

 

        self.assertTrue(1 >= self._count_log_matches('last-revision',

304

 

                                                     http_logs))

305

 

        # FIXME naughty poking in there.

306

 

        self.get_readonly_server().logs = []

307

 

        # check there is nothing more to fetch.  We take care to re-use the

308

 

        # existing transport so that the request logs we're about to examine

309

 

        # aren't cluttered with redundant probes for a smart server.

310

 

        # XXX: Perhaps this further parameterisation: test http with smart

311

 

        # server, and test http without smart server?

312

 

        source = Branch.open(

313

 

            self.get_readonly_url("source/"),

314

 

            possible_transports=[source.bzrdir.root_transport])

315

 

        target.fetch(source)

316

 

        # should make just two requests

317

 

        http_logs = self.get_readonly_server().logs

318

 

        self.log("web server logs are:")

319

 

        self.log('\n'.join(http_logs))

320

 

        self.assertEqual(1, self._count_log_matches('branch-format', http_logs))

321

 

        self.assertEqual(1, self._count_log_matches('branch/format', http_logs))

322

 

        self.assertEqual(1, self._count_log_matches('repository/format',

323

 

            http_logs))

324

 

        self.assertTrue(1 >= self._count_log_matches('revision-history',

325

 

                                                     http_logs))

326

 

        self.assertTrue(1 >= self._count_log_matches('last-revision',

327

 

                                                     http_logs))

328

 

        self.assertEqual(4, len(http_logs))

329

 

 

330

 

 

331

250

class TestKnitToPackFetch(TestCaseWithTransport):

332

251

 

333

252

    def find_get_record_stream(self, calls, expected_count=1):

402

321

        source.inventories = versionedfile.RecordingVersionedFilesDecorator(

403

322

                        source.inventories)

404

323

        # XXX: This won't work in general, but for the dirstate format it does.

405

 

        old_fetch_uses_deltas_setting = target._format._fetch_uses_deltas

406

 

        def restore():

407

 

            target._format._fetch_uses_deltas = old_fetch_uses_deltas_setting

408

 

        self.addCleanup(restore)

409

 

        target._format._fetch_uses_deltas = False

 

324

        self.overrideAttr(target._format, '_fetch_uses_deltas', False)

410

325

        target.fetch(source, revision_id='rev-one')

411

326

        self.assertEqual(('get_record_stream', [('file-id', 'rev-one')],

412

327

                          target._format._fetch_order, True),

576

491

        self.repo.fetch(self.tree.branch.repository, 'second-id')

577

492

        root_id = self.tree.get_root_id()

578

493

        self.assertEqual(

579

 

            ((root_id, 'left-parent'), (root_id, 'ghost-parent'),

580

 

             (root_id, 'not-ghost-parent')),

 

494

            ((root_id, 'left-parent'), (root_id, 'not-ghost-parent')),

581

495

            self.get_parents(root_id, 'second-id'))

582

496

 

583

497

    def make_two_commits(self, change_root, fetch_twice):

• Older »

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